wvengen
|
13a7f84e35
|
localeapp roundtrip [ci skip]
|
2013-10-23 12:48:19 +02:00 |
|
wvengen
|
fc39f9d5c0
|
Merge pull request #186 from foodcoops/i18n
i18n cleanup
|
2013-10-23 03:39:09 -07:00 |
|
wvengen
|
3275e9ba31
|
small i18n bug
|
2013-10-22 00:09:11 +02:00 |
|
wvengen
|
1e73c82205
|
remove unused files (complements bf0dc4af09) [ci skip]
|
2013-10-21 18:00:22 +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
|
51e6a7aeb0
|
Merge pull request #149 from foodcoop-adam/updated-gems
run bundle update and make it work again
|
2013-10-18 03:12:59 -07:00 |
|
wvengen
|
bf0dc4af09
|
remove disfunctional dispatch cgis
|
2013-10-18 00:21:45 +02:00 |
|
wvengen
|
bfcf35cd34
|
fix i18n spec after changes
|
2013-10-17 17:10:33 +02:00 |
|
wvengen
|
e1eb6031c8
|
load fr translation for datepicker
|
2013-10-17 16:48:34 +02:00 |
|
wvengen
|
6e5184d796
|
use rails-i18n translations
|
2013-10-17 16:43:14 +02:00 |
|
wvengen
|
4e61e764df
|
fix haml indentation errors
|
2013-10-17 16:35:50 +02:00 |
|
wvengen
|
092bc6b150
|
translation updates
|
2013-10-17 15:32:03 +02:00 |
|
wvengen
|
389b45a505
|
fix stockit i18n reference
|
2013-10-10 19:23:37 +02:00 |
|
wvengen
|
23b38b5a46
|
fix category heading
|
2013-10-10 19:22:43 +02:00 |
|
wvengen
|
a339ae4c7c
|
i18n simple_form move of remaining labels
|
2013-10-10 19:12:59 +02:00 |
|
wvengen
|
d64590a534
|
more robustness
|
2013-10-10 17:50:10 +02:00 |
|
wvengen
|
1afd8b8387
|
bundle update
|
2013-10-10 17:47:12 +02:00 |
|
wvengen
|
9cb5362e48
|
Merge pull request #185 from foodcoop-rostock/force-order-finish
Force update_attributes! in Order#finish; rescue if error raised
|
2013-10-10 08:30:33 -07: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
|
6c17c17982
|
i18n simple_form move of fax pdf
|
2013-10-09 23:41:15 +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
|
b8ff431634
|
clean up price tooltips javascript
|
2013-10-09 10:43:41 +02:00 |
|
wvengen
|
bdce1b5872
|
Merge branch 'master' into updated-gems
Conflicts:
Gemfile
Gemfile.lock
|
2013-10-09 10:37:02 +02:00 |
|
Julius
|
28644dc334
|
Force update in Order#finish; rescue if error raised
|
2013-10-08 19:58:11 +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 |
|
wvengen
|
ac3e5cd019
|
Merge pull request #184 from foodcoop-rostock/article-price-tooltip
Show StockArticle price details to user
|
2013-10-08 02:14:03 -07:00 |
|
Julius
|
9041a350d5
|
Add some locales for article attributes
|
2013-10-05 22:37:17 +02:00 |
|
Julius
|
10d1615cd8
|
Prepare tooltip for next bootstrap version (as in 1fed9834b3)
|
2013-10-05 22:28:04 +02:00 |
|
Julius
|
3a948e9b73
|
Move list.js extensions to plugins
|
2013-10-04 18:28:45 +02:00 |
|
wvengen
|
dce92b9d7c
|
i18n ordering javascript
|
2013-10-04 15:01:24 +02:00 |
|
wvengen
|
64a597c689
|
use i18n-js
|
2013-10-04 15:01:10 +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 |
|
Julius
|
a3e82f5304
|
Add article price tooltip to StockTaking form
|
2013-10-03 22:14:41 +02:00 |
|
Julius
|
3f822dc396
|
Revert "Fix migrate problem caused by output formating(?)"
This reverts commit 53f24cd885.
|
2013-10-03 22:03:14 +02:00 |
|
Julius
|
26e207aeb1
|
Reuse some list.js standard template functions (thanks to wvengen https://gist.github.com/wvengen/6784056)
|
2013-10-03 16:10:18 +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 |
|
Julius
|
dd54cdce7a
|
Merge branch 'master' of http://github.com/foodcoops/foodsoft
|
2013-10-03 10:47:05 +02:00 |
|
wvengen
|
1870276cd2
|
show user name with use_nick is false
|
2013-10-02 23:43:09 +02:00 |
|
wvengen
|
1946cd1ab3
|
make user creation possible again
|
2013-10-02 23:33:24 +02:00 |
|