wvengen
|
135e938d3d
|
i18n cleanups (affects #137)
|
2013-11-23 12:05:29 +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
|
9b47e5d6c4
|
use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values
|
2013-11-18 11:31:30 +01:00 |
|
wvengen
|
588898d7b0
|
do not error when calling shared_article on non-shared article
|
2013-11-13 23:20:48 +01:00 |
|
wvengen
|
a5a29aff5c
|
Merge pull request #195 from foodcoop-adam/grouporder-many-products
Allow large product lists in member order
|
2013-11-12 08:41:48 -08:00 |
|
wvengen
|
bb5a67033d
|
Merge pull request #194 from foodcoop-adam/plugin-move
Better support for plugins (engines) + move wiki to plugin
|
2013-11-12 03:46:15 -08: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
|
ce3b89c910
|
make authentication methods more readable (thanks @fsmanuel)
|
2013-11-11 16:23:20 +01:00 |
|
wvengen
|
891b9a21c0
|
fix and improve i18n of "My Ordergroup"
|
2013-11-09 14:19:54 +01:00 |
|
wvengen
|
ec85c1de44
|
doc update [ci skip]
|
2013-11-07 20:46:05 +01:00 |
|
wvengen
|
a535fbc517
|
allow large product lists in member order
|
2013-11-05 10:55:28 +01:00 |
|
wvengen
|
f4e4d11bae
|
workaround for integration test problem
|
2013-11-01 20:27:53 +01:00 |
|
wvengen
|
13c8af3642
|
use abbr instead of acronym for heading helper
|
2013-11-01 12:49:21 +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
|
fef17604c5
|
remove unused autocomplete templates
|
2013-10-30 20:50:56 +01:00 |
|
wvengen
|
5ead67f88c
|
remove unused memberships controller/view
|
2013-10-30 20:46:59 +01:00 |
|
wvengen
|
6e9954c86f
|
remove user referencing page as it is not being used anyway
|
2013-10-30 11:04:22 +01:00 |
|
wvengen
|
de948d7692
|
fix and cleanup routing (closes foodcoops#190)
|
2013-10-30 02:27:04 +01:00 |
|
wvengen
|
70c12b7c1f
|
move wiki functionality to plugin
|
2013-10-29 22:42:06 +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
|
e13ca74df3
|
fix new user form
|
2013-10-29 19:11:33 +01:00 |
|
wvengen
|
9ba425aafa
|
fallback for when nick is nil
|
2013-10-29 19:05:24 +01:00 |
|
wvengen
|
e968919cce
|
beautify map invocations of users
|
2013-10-29 18:46:55 +01:00 |
|
wvengen
|
3275e9ba31
|
small i18n bug
|
2013-10-22 00:09:11 +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
|
e1eb6031c8
|
load fr translation for datepicker
|
2013-10-17 16:48:34 +02:00 |
|
wvengen
|
4e61e764df
|
fix haml indentation errors
|
2013-10-17 16:35:50 +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
|
d64590a534
|
more robustness
|
2013-10-10 17:50:10 +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
|
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
|
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
|
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 |
|