Commit graph

29 commits

Author SHA1 Message Date
Julius
9f464706b4 Undo senseless indentation correction 2 2013-07-16 22:04:44 +02:00
Julius
3b91b9f7c6 Undo senseless indentation correction 2013-07-16 22:03:47 +02:00
Julius
7fd8abf381 Replace 'own' js table sorting by stupidtable plugin 2013-07-16 22:01:56 +02:00
Julius
469abb753d Merge branch 'master' into improve-delivery-workflow-further 2013-07-11 19:24:37 +02:00
wvengen
33d3b9c466 merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
Julius
bba70dc875 Change DOM sort style to match existing style 2013-07-08 21:51:15 +02:00
Julius Rapp
a5565b436f Resolve merge conflicts 2013-07-07 14:58:57 +02:00
wvengen
8080cd6b7e pass locale to datepicker, use gem for that 2013-07-07 01:47:22 +02:00
Julius
d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius
dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen
c31e864c73 internationalise currency in order screen 2013-06-26 01:17:04 +02:00
wvengen
931b3bef5e fix touch event twice bug (complements ac62dcce9d) 2013-06-20 01:20:13 +02:00
Julius
cc1a839246 Allow to create stock_article as copy of article in delivery form 2013-06-18 10:48:19 +02:00
Julius
cc5574f8b5 Revert ac62dcce9d 2013-06-18 09:10:31 +02:00
Julius
6e6cce1cb7 Add Select2 jQuery plugin 2013-06-17 16:15:19 +02:00
Julius
a9938df443 Clean up sort functionality; Remove title attributes due to hard I18n 2013-06-17 15:43:42 +02:00
Julius
b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
wvengen
ac62dcce9d make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104) 2013-06-14 01:42:47 +02:00
Julius
65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
Julius
b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius
0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +02:00
Julius
3208321319 Fix stockit increase formula for present behavior 2013-03-14 21:55:10 +01:00
Benjamin Meichsner
310a97912c Fixed disabling submit_button in group order form. 2013-01-26 15:41:46 +01:00
benni
1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni
16de9124fe Fixes orders. 2012-10-30 00:20:47 +01:00
benni
fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni
acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni
f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni
29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00