wvengen
|
2e2efec5e7
|
Get rid of coffeescript.
|
2016-04-25 20:34:30 +02:00 |
|
wvengen
|
adb6089773
|
Disable +/- buttons on boundaries in ordering
|
2015-11-13 18:10:46 +01:00 |
|
wvengen
|
945a9e4d4a
|
Use bootstrap buttons for ordering
|
2015-11-13 18:10:46 +01:00 |
|
Alexander Kirk
|
d9b3064c2e
|
fix missing units calculation, change missing-none background color
|
2015-05-19 17:58:29 +02:00 |
|
Alexander Kirk
|
75967bad22
|
Add color marking to items in group orders that have missing items
|
2015-05-04 06:16:14 +02:00 |
|
wvengen
|
219eb71bc9
|
Allow to specify an order schedule for new orders.
|
2014-11-23 00:38:13 +01:00 |
|
wvengen
|
6e990fed4c
|
Upgrade to rails 4.1
|
2014-11-21 14:37:56 +01:00 |
|
wvengen
|
d8f4ac47dd
|
handle ajax errors (closes foodcoops#300)
|
2014-07-02 13:55:05 +02:00 |
|
wvengen
|
2bf13dbefa
|
give partially unused order articles a distinct colour
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
8c0df3b4e8
|
edit order user-interface update
also closes foodcoops#145
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
b5b4ccd922
|
make data-submit-onchange work with datepicker
|
2014-06-23 17:51:17 +02:00 |
|
wvengen
|
950480941a
|
expanded data-ignore-onchange support
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
8fba40eba6
|
fix submit-onchange
|
2014-02-19 11:41:10 +01:00 |
|
wvengen
|
60826ceedc
|
allow to edit GroupOrderArticle result from orders screen
Conflicts:
app/assets/javascripts/application.js
|
2014-02-10 16:03:08 +01:00 |
|
wvengen
|
7ebb2459e0
|
make click work better on touch devices (closes foodcoops#104)
|
2014-01-25 15:19:50 +01:00 |
|
wvengen
|
23ee2ef0fb
|
Revert "make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)"
This reverts commit add4afd172.
Conflicts:
app/assets/javascripts/application.js
|
2014-01-25 15:15:42 +01:00 |
|
wvengen
|
27a73be68f
|
Merge remote-tracking branch 'foodcoops/master' into feature-receive
|
2014-01-02 18:57:59 +01:00 |
|
wvengen
|
5d8f71f834
|
move javascript a little
|
2013-12-23 11:51:38 +01:00 |
|
Julius
|
53e611c1c0
|
Allow browser to store new password after change
|
2013-12-22 18:26:28 +01:00 |
|
wvengen
|
68c4affb02
|
better disabled button
|
2013-12-18 22:22:34 +01:00 |
|
wvengen
|
98e7189d31
|
Merge branch 'master' into i18n
Conflicts:
app/assets/javascripts/application.js
|
2013-10-18 12:30:34 +02:00 |
|
wvengen
|
51e6a7aeb0
|
Merge pull request #149 from foodcoop-adam/updated-gems
run bundle update and make it work again
|
2013-10-18 03:12:59 -07:00 |
|
wvengen
|
e1eb6031c8
|
load fr translation for datepicker
|
2013-10-17 16:48:34 +02:00 |
|
wvengen
|
34a4951e28
|
Merge branch 'master' into i18n
Conflicts:
Gemfile
config/locales/de.yml
config/locales/en.yml
|
2013-10-09 23:57:43 +02:00 |
|
wvengen
|
b8ff431634
|
clean up price tooltips javascript
|
2013-10-09 10:43:41 +02:00 |
|
wvengen
|
bdce1b5872
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile
Gemfile.lock
|
2013-10-09 10:37:02 +02:00 |
|
Julius
|
3a948e9b73
|
Move list.js extensions to plugins
|
2013-10-04 18:28:45 +02:00 |
|
wvengen
|
dce92b9d7c
|
i18n ordering javascript
|
2013-10-04 15:01:24 +02:00 |
|
wvengen
|
64a597c689
|
use i18n-js
|
2013-10-04 15:01:10 +02:00 |
|
Julius
|
26e207aeb1
|
Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056)
|
2013-10-03 16:10:18 +02:00 |
|
Julius
|
c1ac95e440
|
list.unlist.js: Use jQuery's toggleClass instead of native if-else (just for briefness)
|
2013-09-25 20:58:53 +02:00 |
|
Julius
|
a87ced2646
|
Hide article category if no article matches the search
|
2013-09-24 21:21:08 +02:00 |
|
Julius
|
9f083dd4d0
|
Add button to clear article search (list.js customization)
|
2013-09-23 21:31:54 +02:00 |
|
Julius
|
6ec81ace18
|
Always show article category headers (do not unlist them on list.js search)
|
2013-09-22 22:04:29 +02:00 |
|
Julius
|
891293af84
|
Add delay to list.js search
|
2013-09-22 21:50:59 +02:00 |
|
Julius
|
14d4d2f12d
|
Add list.js for filtering articles (another try for foodcoops#143)
|
2013-09-18 23:28:18 +02:00 |
|
wvengen
|
ccea97c2b3
|
update bootstrap assets
|
2013-07-17 11:31:12 +02:00 |
|
wvengen
|
eef4626107
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile.lock
app/views/deliveries/_form.html.haml
|
2013-07-17 11:04:28 +02:00 |
|
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 |
|
wvengen
|
9fb6597980
|
Merge branch 'master' into updated-gems
|
2013-07-16 00:00:55 +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 |
|
wvengen
|
33b27d2fa7
|
proper usage of jQuery.on(), and update javascript in views as well
|
2013-07-08 22:41:06 +02:00 |
|
Julius
|
bba70dc875
|
Change DOM sort style to match existing style
|
2013-07-08 21:51:15 +02:00 |
|
wvengen
|
e9e7135639
|
run bundle update and make it work again
|
2013-07-08 14:32:24 +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 |
|