wvengen
|
2bf13dbefa
|
give partially unused order articles a distinct colour
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
2a6e0e0460
|
fix asset url in css (unbreaks heroku image 404)
|
2014-06-23 17:51:18 +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
|
4c1e5e2b00
|
fix default textarea height
|
2014-05-13 17:01:27 +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
|
f9d2c20aaa
|
cleanup articles sorted in groups
|
2014-02-10 15:58:58 +01:00 |
|
wvengen
|
6e0489b25f
|
Merge pull request #257 from wvengen/feature-touchclick
Better workaround for touch devices
|
2014-02-03 06:33:27 -08: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
|
8db516c5f0
|
Merge branch 'master' into feature-cleaner_order_details
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2014-01-20 13:36:46 +01:00 |
|
wvengen
|
8b4c292ea0
|
Merge pull request #222 from wvengen/feature-receive
New receive screen
|
2014-01-20 03:02:27 -08:00 |
|
wvengen
|
42d622d1b2
|
cleanup orders and add search
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
|
2014-01-17 13:41:38 +01:00 |
|
wvengen
|
b2f032ac8e
|
fix bootstrap menu on mobile [ci skip]
|
2014-01-13 14:45:48 +01:00 |
|
wvengen
|
90c81de872
|
update receive delta column + responsive css
|
2014-01-09 12:20:54 +01:00 |
|
wvengen
|
56bd527a8b
|
keep white input background with package class [ci skip]
|
2014-01-09 10:51:54 +01:00 |
|
wvengen
|
b331d9a2a9
|
better css responsiveness [ci skip]
|
2014-01-08 19:58:51 +01:00 |
|
wvengen
|
65e79d7e1b
|
small receive usability changes
|
2014-01-08 19:28:39 +01:00 |
|
wvengen
|
dcc3d21b4d
|
center table rows vertically [ci skip]
|
2014-01-08 10:32:30 +01:00 |
|
Julius
|
8479678530
|
Improve unlock button for receiving OrderArticles manually adjusted
Conflicts:
app/views/orders/_edit_amount.html.haml
|
2014-01-04 20:51:42 +01:00 |
|
wvengen
|
133429720c
|
old price display tweaks
|
2014-01-03 14:11:50 +01:00 |
|
wvengen
|
9219d099c8
|
ui update for packages display
|
2014-01-03 12:42:36 +01:00 |
|
wvengen
|
014a62aa11
|
use disabled property for input and fix style
|
2014-01-03 10:59:42 +01:00 |
|
wvengen
|
a439f26b67
|
ui design update
|
2014-01-02 22:30:04 +01:00 |
|
wvengen
|
27a73be68f
|
Merge remote-tracking branch 'foodcoops/master' into feature-receive
|
2014-01-02 18:57:59 +01:00 |
|
wvengen
|
f5bd7a43e4
|
update balancing order article edit screen to support received units
|
2013-12-23 15:25:45 +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
|
82d1c41e9f
|
update show order
|
2013-12-18 21:46:34 +01:00 |
|
wvengen
|
2b511ee559
|
Merge branch 'master' into fresh-flow
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2013-12-18 17:03:26 +01:00 |
|
wvengen
|
c5b1236f21
|
Merge pull request #218 from foodcoop-adam/article-dialog
Edit article user-interface update
|
2013-12-17 06:29:04 -08:00 |
|
wvengen
|
3f497e9274
|
allow more than two columns in horizontal form
|
2013-12-10 23:41:45 +01:00 |
|
wvengen
|
da737793e8
|
workaround help block margin issue [ci skip]
|
2013-12-10 16:50:04 +01:00 |
|
wvengen
|
85b6ff908b
|
make new article dialog more responsive
|
2013-12-10 16:41:26 +01:00 |
|
Julius
|
cdb87a8389
|
Highlight created/updated stock_article in StockArticle#index view
|
2013-12-07 17:10:40 +01:00 |
|
wvengen
|
62ca3cb634
|
small layout cleanup [ci skip]
|
2013-12-06 14:49:13 +01:00 |
|
wvengen
|
2f10210c76
|
remove unimplemented unit_divide box
|
2013-12-06 14:38:28 +01:00 |
|
wvengen
|
c99aa7aab6
|
add availability to article edit dialog
|
2013-12-06 14:33:51 +01:00 |
|
wvengen
|
923b579bd1
|
Merge branch 'master' into article-dialog
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2013-12-06 14:26:50 +01:00 |
|
wvengen
|
3937400683
|
fix modal dialog margin [ci skip]
|
2013-12-06 14:26:04 +01:00 |
|
wvengen
|
c900cf4988
|
make product redistribution work!
|
2013-11-27 00:06:25 +01:00 |
|
wvengen
|
853e8ba9d2
|
add package images [ci skip]
|
2013-11-25 15:25:13 +01:00 |
|
wvengen
|
9c340ec08e
|
more clarity whether a number is number units or boxes
|
2013-11-25 15:13:54 +01:00 |
|
wvengen
|
bd1b932775
|
add receive screen, quantities for model, redistribution
|
2013-11-25 14:17:31 +01:00 |
|
wvengen
|
84191ddcd0
|
first shot on improving edit article form
(see also foodcoops#209)
|
2013-11-20 23:46:11 +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 |
|