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 |
|
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
|
b9599ce455
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile.lock
|
2013-07-18 20:28:56 +02:00 |
|
wvengen
|
74bfc85562
|
Merge remote-tracking branch 'fsmanuel/master' into master.
Updated migration date to today.
Conflicts:
db/schema.rb
|
2013-07-18 18:48:49 +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
|
4fafdcb7ad
|
Remove broken font-size fix which is no longer needed
|
2013-07-15 21:58:09 +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 |
|