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 |
|
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
|
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
|
552af7925d
|
i18n simple_form move of tasks
|
2013-10-09 22:41:23 +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
|
bbcad49831
|
start moving from simple_form i18n to activerecord
|
2013-10-03 16:03:13 +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 |
|
wvengen
|
0bb62332c0
|
localeapp roundtrip
|
2013-10-01 00:05:46 +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 |
|
Benjamin Meichsner
|
5444c3a1c0
|
Merged updates from localeapp.
|
2013-09-18 17:48:24 +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
|
9922c0322a
|
first version of new translation: French
|
2013-09-06 19:41:24 +02:00 |
|