wvengen
|
133429720c
|
old price display tweaks
|
2014-01-03 14:11:50 +01:00 |
|
wvengen
|
438de97464
|
fix non-closed order display
|
2014-01-03 13:00:14 +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 |
|
Julius
|
f230d39055
|
Merge price columns in receive form into one
Conflicts:
app/views/orders/_edit_amount.html.haml
|
2014-01-03 10:36:57 +01:00 |
|
wvengen
|
98f59a3de3
|
Readonly receive input if GroupOrderArticle result has manually been changed
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
|
2014-01-03 10:33:09 +01:00 |
|
wvengen
|
a439f26b67
|
ui design update
|
2014-01-02 22:30:04 +01:00 |
|
Julius
|
8e52fca304
|
Do not set quantity of newly created OrderArticles to 1
|
2014-01-02 19:17:46 +01:00 |
|
Julius
|
5349ee142e
|
Offer _undeleted_ StockArticles for new OrderArticle only
|
2014-01-02 19:14:50 +01:00 |
|
Julius
|
baa5f16cfc
|
Free order_article resource from finance namespace; also unlock for role_orders
|
2014-01-02 19:14:41 +01:00 |
|
wvengen
|
27a73be68f
|
Merge remote-tracking branch 'foodcoops/master' into feature-receive
|
2014-01-02 18:57:59 +01:00 |
|
wvengen
|
45ad8e6524
|
move helper to new module
|
2013-12-23 11:48:17 +01:00 |
|
Julius
|
ed228c4bd7
|
Allow control of password autocomplete by flag
|
2013-12-22 23:21:14 +01:00 |
|
wvengen
|
54e98474b1
|
remove unused helper [ci skip]
|
2013-12-18 22:35:01 +01:00 |
|
wvengen
|
84fe791078
|
update balancing screen
|
2013-12-18 22:10:38 +01:00 |
|
wvengen
|
1ab09b41bd
|
fix articles_for_select2 helper
|
2013-12-18 17:34:45 +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
|
5af82eb55c
|
Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
|
2013-12-17 06:28:25 -08:00 |
|
wvengen
|
b53cb36714
|
give proper block to link_to_ordering (closes #201)
|
2013-12-11 22:58:50 +01:00 |
|
wvengen
|
e25570d870
|
Merge remote-tracking branch 'tg-x/master'
Conflicts:
app/views/shared/_open_orders.html.haml
|
2013-12-11 22:39:37 +01:00 |
|
wvengen
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +01:00 |
|
Julius
|
bceabfec5c
|
Apply publish/subscribe pattern to stock_article manipulation in delivery form
|
2013-12-07 16:42:25 +01:00 |
|
Julius Rapp
|
11117738ce
|
Resolve merge conflicts
|
2013-12-07 11:50:37 +01:00 |
|
Julius Rapp
|
dd08e277c7
|
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
|
2013-12-07 11:20:44 +01:00 |
|
wvengen
|
111c061efa
|
more i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:53:59 +01:00 |
|
wvengen
|
2d99141229
|
only allow to add articles not already present in receive
|
2013-11-26 13:31:07 +01:00 |
|
wvengen
|
bd1b932775
|
add receive screen, quantities for model, redistribution
|
2013-11-25 14:17:31 +01:00 |
|
wvengen
|
1f08ee4759
|
Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order
Conflicts:
app/views/shared/_open_orders.html.haml
|
2013-11-25 10:11:56 +01:00 |
|
wvengen
|
810656a53b
|
small link_to_ordering refactoring
|
2013-11-25 10:04:44 +01:00 |
|
wvengen
|
20bd86fe65
|
make heading_helper work with empty _short translation
|
2013-11-24 01:59:44 +01:00 |
|
wvengen
|
66ac3be81f
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
|
2013-11-18 11:42:49 +01:00 |
|
tg(x)
|
de9453fa24
|
dashboard: link to view order page
|
2013-11-13 16:42:32 +01:00 |
|
wvengen
|
bb5a67033d
|
Merge pull request #194 from foodcoop-adam/plugin-move
Better support for plugins (engines) + move wiki to plugin
|
2013-11-12 03:46:15 -08:00 |
|
wvengen
|
13c8af3642
|
use abbr instead of acronym for heading helper
|
2013-11-01 12:49:21 +01:00 |
|
wvengen
|
70c12b7c1f
|
move wiki functionality to plugin
|
2013-10-29 22:42:06 +01:00 |
|
wvengen
|
c37ed74942
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/foodcoop/users/_users.html.haml
|
2013-10-29 19:15:52 +01:00 |
|
wvengen
|
9ba425aafa
|
fallback for when nick is nil
|
2013-10-29 19:05:24 +01:00 |
|
wvengen
|
78c81b194c
|
i18n simple_form move of foodcoop
|
2013-10-09 23:00:07 +02:00 |
|
wvengen
|
bbcad49831
|
start moving from simple_form i18n to activerecord
|
2013-10-03 16:03:13 +02:00 |
|
wvengen
|
f6c2fd9a9d
|
more user display changes
|
2013-09-22 02:15:35 +02:00 |
|
wvengen
|
e4f0a1e3ed
|
start of making nickname optional
|
2013-09-20 22:40:13 +02:00 |
|
Benjamin Meichsner
|
71e02ab569
|
Merge branch 'rails3' into rails3-to-master
Conflicts:
app/views/suppliers/shared_suppliers.haml
|
2013-09-02 13:31:40 +02:00 |
|
Julius
|
b303b48853
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-13 21:08:50 +02:00 |
|
Julius
|
12506e54b8
|
Remove stock_changes_helper.rb
|
2013-07-13 09:34:19 +02:00 |
|
Julius
|
469abb753d
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-11 19:24:37 +02:00 |
|
Julius
|
620686fa46
|
Merge branch 'master' into stock_article_quantity_history
|
2013-07-11 19:23:52 +02:00 |
|
Julius
|
7c27017306
|
Link delivery/stock_taking/order in stock_changes index
|
2013-07-11 18:37:55 +02:00 |
|
Julius
|
ef62a18ac9
|
Add StockChanges index
|
2013-07-09 21:46:04 +02:00 |
|
Julius
|
ff1317b17b
|
Add hint to copy stock_article if price change desired in delivery process
|
2013-07-08 21:02:43 +02:00 |
|
wvengen
|
1eeec23c80
|
only add undeleted articles in balancing screen
|
2013-07-08 02:31:54 +02:00 |
|