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
|
98e7189d31
|
Merge branch 'master' into i18n
Conflicts:
app/assets/javascripts/application.js
|
2013-10-18 12:30:34 +02:00 |
|
wvengen
|
092bc6b150
|
translation updates
|
2013-10-17 15:32:03 +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
|
762292ef8e
|
small i18n move
|
2013-10-09 22:29:19 +02:00 |
|
wvengen
|
1b49a08c5e
|
localeapp roundtrip
|
2013-10-08 11:42:23 +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
|
1d8fefcfb7
|
small i18n update
|
2013-10-02 17:08:24 +02:00 |
|
wvengen
|
0bb62332c0
|
localeapp roundtrip
|
2013-10-01 00:05:46 +02:00 |
|
wvengen
|
f1f7e8d709
|
localeapp roundtrip
|
2013-09-18 19:14:48 +02:00 |
|
wvengen
|
ee31c0c2af
|
localeapp roundtrip
|
2013-09-10 12:06:40 +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 |