wvengen
|
418a8b5806
|
fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
|
2014-09-15 13:52:35 +02:00 |
|
wvengen
|
94e100b78b
|
localeapp roundtrip
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
873e8d44a2
|
harmonize foodsoft capitalisation
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
6466ea9653
|
revamp footer
|
2014-06-23 17:51:20 +02:00 |
|
wvengen
|
e7a476e6b6
|
remove unused season import fields
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
c54e15dc04
|
localeapp roundtrip
|
2014-06-23 17:51:18 +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
|
9743a9f112
|
localeapp roundtrip
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
fe0b17cdb0
|
cleanup email footer
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
9214fff5a1
|
localeapp roundtrip (mostly formatting changes)
|
2014-03-15 17:17:25 +01:00 |
|
wvengen
|
346bf00b67
|
localeapp roundtrip (includes updated German translation)
|
2014-02-19 11:42:25 +01:00 |
|
wvengen
|
286c96196c
|
localeapp roundtrip
|
2014-02-15 12:37:01 +01:00 |
|
wvengen
|
f9d2c20aaa
|
cleanup articles sorted in groups
|
2014-02-10 15:58:58 +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
|
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 |
|
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 |
|
Julius
|
f83f6971e8
|
Rename update_current_price to update_global_price to avoid confusion
|
2014-01-04 21:35:19 +01:00 |
|
Robert Waltemath
|
2f02f89089
|
Allow login through link in message (and remember requested page).
|
2014-01-03 15:27:15 +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 |
|
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
|
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
|
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
|
2b6a84ddf8
|
localeapp roundtrip
|
2013-12-12 00:33:35 +01:00 |
|
wvengen
|
6bbc614e42
|
localeapp roundtrip (closes foodcoops#156)
|
2013-12-10 18:03:50 +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
|
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 |
|
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
|
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
|
6410396489
|
localeapp roundtrip
|
2013-11-24 02:12:32 +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
|
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 |
|
wvengen
|
13a7f84e35
|
localeapp roundtrip [ci skip]
|
2013-10-23 12:48:19 +02:00 |
|
wvengen
|
d1f9b0b090
|
apply changes to other translations + translation fixes
|
2013-10-21 17:55:58 +02:00 |
|
wvengen
|
6e5184d796
|
use rails-i18n translations
|
2013-10-17 16:43:14 +02:00 |
|
wvengen
|
a339ae4c7c
|
i18n simple_form move of remaining labels
|
2013-10-10 19:12:59 +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
|
67e29620f4
|
i18n simple_form move of invoices
|
2013-10-09 23:37:08 +02:00 |
|
wvengen
|
6ba971fe15
|
i18n simple_form move of deliveries
|
2013-10-09 23:19:40 +02:00 |
|
wvengen
|
c3d22e883d
|
i18n simple_form move of suppliers
|
2013-10-09 23:12:26 +02:00 |
|
wvengen
|
78c81b194c
|
i18n simple_form move of foodcoop
|
2013-10-09 23:00:07 +02:00 |
|
wvengen
|
762292ef8e
|
small i18n move
|
2013-10-09 22:29:19 +02:00 |
|
wvengen
|
1b49a08c5e
|
localeapp roundtrip
|
2013-10-08 11:42:23 +02:00 |
|
wvengen
|
a32a3757d2
|
Merge pull request #180 from foodcoop-rostock/search-article-list-modified
Search articles in group_orders form
|
2013-10-08 02:21:35 -07:00 |
|
Julius
|
9041a350d5
|
Add some locales for article attributes
|
2013-10-05 22:37:17 +02:00 |
|
wvengen
|
dce92b9d7c
|
i18n ordering javascript
|
2013-10-04 15:01:24 +02:00 |
|
wvengen
|
a9dff7f1df
|
add missing i18n
|
2013-10-04 10:25:53 +02:00 |
|
Julius
|
ac1341d5b0
|
Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip
|
2013-10-03 23:22:31 +02:00 |
|
Julius
|
9a9a782bc4
|
Complete StockArticle#show view
|
2013-10-03 23:21:53 +02:00 |
|
Julius
|
fef8c6d99f
|
Move StockArticle#history to StockArticle#show
|
2013-10-03 22:24:21 +02:00 |
|
wvengen
|
1674dcf851
|
fix i18n of article sync
|
2013-10-03 14:36:53 +02:00 |
|
wvengen
|
3574f239c6
|
localeapp roundtrip
|
2013-10-02 17:33:37 +02:00 |
|
wvengen
|
17bbb0705b
|
fix i18n
|
2013-10-02 17:23:49 +02:00 |
|
wvengen
|
a8ace3bc79
|
add missing i18n
|
2013-10-02 17:13:49 +02:00 |
|
wvengen
|
1d8fefcfb7
|
small i18n update
|
2013-10-02 17:08:24 +02:00 |
|
Julius
|
9f083dd4d0
|
Add button to clear article search (list.js customization)
|
2013-09-23 21:31:54 +02:00 |
|
wvengen
|
77fbf3ca81
|
Merge pull request #175 from foodcoop-rostock/fix-balancing
Added hint when changing total delivered amount.
|
2013-09-23 02:14:50 -07:00 |
|
Julius
|
14d4d2f12d
|
Add list.js for filtering articles (another try for foodcoops#143)
|
2013-09-18 23:28:18 +02:00 |
|
wvengen
|
f1f7e8d709
|
localeapp roundtrip
|
2013-09-18 19:14:48 +02:00 |
|
Benjamin Meichsner
|
b015ceea0b
|
Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article
|
2013-09-18 17:50:30 +02:00 |
|
Robert Waltemath
|
142de28ade
|
Split up messages for stock/ supplier orders.
|
2013-09-18 10:50:56 +02:00 |
|
Robert Waltemath
|
dbb0bb4506
|
Added hint when changing total delivered amount.
|
2013-09-18 10:07:50 +02:00 |
|
Robert Waltemath
|
e728e76729
|
Merge branch 'master' into warn-uncheck-ordered-article
|
2013-09-17 17:10:56 +02:00 |
|
wvengen
|
8ca95f396f
|
make both ordered and received products visible in order screens and pdfs
|
2013-09-16 23:52:58 +02:00 |
|
wvengen
|
ee31c0c2af
|
localeapp roundtrip
|
2013-09-10 12:06:40 +02:00 |
|
wvengen
|
b235592656
|
add total to order pdf, layout changes (closes foodcoops/foodsoft#138)
|
2013-09-10 11:59:32 +02:00 |
|
wvengen
|
6418790ef5
|
localeapp roundtrip, with updated translations
|
2013-09-10 10:46:02 +02:00 |
|
wvengen
|
12c0636941
|
fix i18n buglets (closes #167)
|
2013-09-10 10:27:13 +02:00 |
|
wvengen
|
9922c0322a
|
first version of new translation: French
|
2013-09-06 19:41:24 +02:00 |
|
Robert Waltemath
|
805071f3fb
|
Added checkbox to ignore warnings. Added translations.
|
2013-09-04 10:52:14 +02:00 |
|
Benjamin Meichsner
|
51a91f376d
|
Updated locales from localeapp.
|
2013-09-02 13:34:30 +02:00 |
|
wvengen
|
3e4c535bb1
|
update translations and localeapp roundtrip
|
2013-07-18 19:27:52 +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 |
|
Manuel Wiedenmann
|
dfe1cee4cd
|
german i18n + mini fix
|
2013-07-18 16:23:29 +02:00 |
|
wvengen
|
1d12e09342
|
update translations and localeapp roundtrip
|
2013-07-18 16:22:38 +02:00 |
|
Julius
|
b303b48853
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-13 21:08:50 +02:00 |
|
wvengen
|
3fd498d29f
|
translations update
|
2013-07-13 12:37:20 +02:00 |
|
wvengen
|
126f7e7459
|
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
Show StockChanges index
|
2013-07-13 03:16:31 -07:00 |
|