wvengen
|
8c0df3b4e8
|
edit order user-interface update
also closes foodcoops#145
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
ef0888f38d
|
add view for all transactions + csv
|
2014-06-23 17:51:17 +02:00 |
|
wvengen
|
a7ebf78fd4
|
hide insignificant zeroes for percentage
|
2014-05-17 14:20:48 +02:00 |
|
wvengen
|
cf0558b1ff
|
localeapp roundtrip
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
9821f111c2
|
add missing locale
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
64bb8e043d
|
enable/disable plugins by config option
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
852f3484ad
|
make settle directly less dangerous
(closes foodcoops#275)
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
9743a9f112
|
localeapp roundtrip
|
2014-05-13 17:01:25 +02:00 |
|
Robert Waltemath
|
7556c753d0
|
Extract message system to plugin.
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
fe0b17cdb0
|
cleanup email footer
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
48e9a3e4f5
|
add fax csv
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
0fa9bebac9
|
show supplier user-interface update
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
0014435663
|
improved shared database import ui
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
9214fff5a1
|
localeapp roundtrip (mostly formatting changes)
|
2014-03-15 17:17:25 +01:00 |
|
wvengen
|
bb9269f755
|
avoid word-wrap when showing currency
|
2014-03-15 16:40:53 +01:00 |
|
wvengen
|
346bf00b67
|
localeapp roundtrip (includes updated German translation)
|
2014-02-19 11:42:25 +01:00 |
|
wvengen
|
e61b3dc248
|
update Dutch translation
|
2014-02-15 12:38:05 +01:00 |
|
wvengen
|
286c96196c
|
localeapp roundtrip
|
2014-02-15 12:37:01 +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
|
2de4a2a3a0
|
Merge pull request #256 from wvengen/feature-partial_shared_sync
Small change to allow non-shared articles with shared suppliers
|
2014-02-07 11:24:33 +01:00 |
|
wvengen
|
d08f120b27
|
show message when ignoring articles due to missing order number
|
2014-01-24 22:20:29 +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
|
c5cc714f9b
|
add Dutch translation texts
|
2014-01-20 13:30:14 +01:00 |
|
wvengen
|
3b2d4dfd08
|
localeapp roundtrip
|
2014-01-20 12:59:57 +01:00 |
|
wvengen
|
6c0de3dc74
|
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
Conflicts:
config/locales/de.yml
config/locales/en.yml
|
2014-01-20 12:12:00 +01:00 |
|
wvengen
|
5b6d1a66a6
|
complete show order i18n
Conflicts:
app/helpers/orders_helper.rb
|
2014-01-17 14:25:57 +01: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
|
bab28d2770
|
i18n update
|
2014-01-13 23:23:37 +01:00 |
|
wvengen
|
45e529b008
|
revert i18n attributes pluralisation
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
|
2014-01-11 16:30:17 +01:00 |
|
wvengen
|
cb3e2f7ca0
|
Merge branch 'master' into feature-receive
Conflicts:
config/locales/de.yml
|
2014-01-11 15:56:33 +01:00 |
|
Julius
|
9db8cb72df
|
Synchronize German and English locales
|
2014-01-10 20:50:58 +01:00 |
|
wvengen
|
063ec61753
|
localeapp roundtrip
|
2014-01-10 00:00:57 +01:00 |
|
wvengen
|
b30b424540
|
Merge branch 'master' into feature-receive
Conflicts:
app/helpers/finance/order_articles_helper.rb
|
2014-01-09 18:42:29 +01:00 |
|
wvengen
|
2b97ca050a
|
i18n oops
|
2014-01-09 13:22:32 +01:00 |
|
wvengen
|
124341c7d6
|
receive helper and i18n cleanup
|
2014-01-09 13:01:10 +01:00 |
|
wvengen
|
ce17bf33e0
|
complete and improve receive i18n
|
2014-01-08 13:39:49 +01:00 |
|
wvengen
|
6e60f94484
|
small receive-related i18n updates
|
2014-01-08 12:52:29 +01:00 |
|
Julius
|
563993fffa
|
Complete I18n of current receive screen
|
2014-01-08 00:06:50 +01:00 |
|
Julius
|
d7c771d10a
|
Continue I18n of receive screen
|
2014-01-06 23:48:39 +01:00 |
|
wvengen
|
69a29b8296
|
Merge pull request #245 from fsmanuel/rss_feed + 1
|
2014-01-06 13:55:32 +01:00 |
|
Julius
|
f83f6971e8
|
Rename update_current_price to update_global_price to avoid confusion
|
2014-01-04 21:35:19 +01:00 |
|
Manuel Wiedenmann
|
0d0ff90a64
|
adds an RSS feed for pages/all
|
2014-01-04 20:12:01 +01:00 |
|
Robert Waltemath
|
2f02f89089
|
Allow login through link in message (and remember requested page).
|
2014-01-03 15:27:15 +01:00 |
|
wvengen
|
133429720c
|
old price display tweaks
|
2014-01-03 14:11:50 +01:00 |
|
wvengen
|
4c9e84ecc6
|
change layout of receive unlock
|
2014-01-03 12:40:43 +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 |
|
Julius
|
01264bc0ac
|
Clean up OrderArticle#new form and related stuff
|
2014-01-02 19:14:46 +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 |
|
Julius
|
3336065218
|
Add missing translations for ArticlePrice attributes
|
2013-12-30 12:38:26 +01:00 |
|
Julius
|
f3c3b7af34
|
Fix StockArticle#derive title i18n
|
2013-12-28 20:07:28 +01:00 |
|
Julius
|
3bf1392251
|
Show clearer error message on WikiCloth exception
|
2013-12-22 23:34:54 +01:00 |
|
Julius
|
42e983f7ee
|
Move html markup of WikiCloth exception from locales to controller
|
2013-12-22 18:09:40 +01:00 |
|
Julius
|
496a250495
|
Rescue on WikiCloth exception
|
2013-12-22 12:17:02 +01:00 |
|
wvengen
|
88f2dad706
|
language change
|
2013-12-18 22:14:52 +01:00 |
|
wvengen
|
84fe791078
|
update balancing screen
|
2013-12-18 22:10:38 +01:00 |
|
wvengen
|
873a1ff108
|
update texts
|
2013-12-18 21:58:15 +01:00 |
|
wvengen
|
d299fa4870
|
move receive screen to orders
|
2013-12-18 21:08:58 +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
|
a02ca1b9c0
|
localeapp roundtrip [ci skip]
|
2013-12-17 18:54:05 +01:00 |
|
wvengen
|
94b2c8eac3
|
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
|
2013-12-17 15:58:47 +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
|
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
|
a91c97526e
|
complete German translations (thanks @fsmanuel) [ci skip]
|
2013-12-16 10:55:45 +01:00 |
|
wvengen
|
11a2b865aa
|
localeapp roundtrip
|
2013-12-14 13:35:52 +01:00 |
|
wvengen
|
46ab4dcc01
|
proper i18n of last ordergroup order (thanks @JuliusR)
|
2013-12-14 13:15:47 +01:00 |
|
wvengen
|
2b6a84ddf8
|
localeapp roundtrip
|
2013-12-12 00:33:35 +01:00 |
|
wvengen
|
d448707b1a
|
i18n cleanup (affects foodcoops#137)
|
2013-12-12 00:13:19 +01:00 |
|
wvengen
|
6bbc614e42
|
localeapp roundtrip (closes foodcoops#156)
|
2013-12-10 18:03:50 +01:00 |
|
wvengen
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +01:00 |
|
wvengen
|
85b6ff908b
|
make new article dialog more responsive
|
2013-12-10 16:41:26 +01:00 |
|
Julius
|
30b35cdd11
|
Improve usability of supplier selection for stock_articles in delivery form
|
2013-12-09 00:03:07 +01:00 |
|
Julius
|
7eb64e3c9d
|
Update locales
|
2013-12-07 17:58:06 +01:00 |
|
Julius
|
7a673b1a8b
|
Move stock_article locales from delivery to stock_article
|
2013-12-07 17:48:04 +01:00 |
|
Julius
|
92f560e189
|
Again revert wrong quotation mark in English locale
|
2013-12-07 16:46:16 +01:00 |
|
Julius
|
3e49104318
|
Revert wrong quotation mark in English locale
|
2013-12-07 16:44:16 +01:00 |
|
Julius
|
13bb4e0a8b
|
Rename 'simple_form.hints.stock_article.copy_stock_article' to 'simple_form.hints.stock_article.copy'
|
2013-12-07 15:12:08 +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
|
b05c75aef3
|
localeapp roundtrip
|
2013-12-06 23:12:15 +01:00 |
|
wvengen
|
112fa3be23
|
fix forgotten i18n string (affects foodcoops#137)
|
2013-12-06 23:08:28 +01:00 |
|
wvengen
|
111c061efa
|
more i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:53:59 +01:00 |
|
wvengen
|
a475a27f79
|
i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:43:36 +01:00 |
|
wvengen
|
1c4b9591a2
|
fix edit article dialog title
|
2013-12-06 12:34:14 +01:00 |
|
wvengen
|
e42589ae72
|
translations update (localeapp roundtrip)
|
2013-12-06 11:58:08 +01:00 |
|
wvengen
|
9990e059d4
|
fix i18n
|
2013-11-25 15:24:20 +01:00 |
|
wvengen
|
bd1b932775
|
add receive screen, quantities for model, redistribution
|
2013-11-25 14:17:31 +01:00 |
|
wvengen
|
6410396489
|
localeapp roundtrip
|
2013-11-24 02:12:32 +01:00 |
|
wvengen
|
e5471b9f73
|
more i18n cleanup
|
2013-11-24 01:47:34 +01:00 |
|
wvengen
|
652a392b37
|
simplify i18n and fix some small ui issues
|
2013-11-23 17:49:43 +01:00 |
|
wvengen
|
135e938d3d
|
i18n cleanups (affects #137)
|
2013-11-23 12:05:29 +01:00 |
|
wvengen
|
2ac7016ccc
|
localeapp roundtrip [ci skip]
|
2013-11-18 15:01:26 +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 |
|
wvengen
|
5daf1a466f
|
localeapp roundtrip
|
2013-11-11 18:08:28 +01:00 |
|
wvengen
|
768796407f
|
Merge pull request #192 from foodcoop-adam/cleanup-stale
Cleanup unused views&controllers
|
2013-11-11 09:05:19 -08:00 |
|
wvengen
|
891b9a21c0
|
fix and improve i18n of "My Ordergroup"
|
2013-11-09 14:19:54 +01:00 |
|
wvengen
|
f7a0103553
|
clearer login field name
|
2013-10-30 21:28:35 +01:00 |
|
wvengen
|
3588962329
|
remove unused layout
|
2013-10-30 20:53:01 +01:00 |
|
wvengen
|
5ead67f88c
|
remove unused memberships controller/view
|
2013-10-30 20:46:59 +01:00 |
|