Commit graph

2028 commits

Author SHA1 Message Date
wvengen
70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen
d4dccbc646 add foodsoft_wiki plugin to Gemfile by default 2013-10-29 22:23:17 +01:00
wvengen
6d0ba985aa first version of the foodsoft_wiki plugin 2013-10-29 22:22:24 +01:00
wvengen
fde7904c1a allow plugins to modify the navigation menu 2013-10-29 22:18:38 +01:00
wvengen
7779c15dc9 update testing gems to try fixing occasional integration test error 2013-10-29 21:31:07 +01:00
wvengen
201f23381b remove deprecated plugins directory 2013-10-29 20:28:09 +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
ed0ac706b9 small README changes [ci skip] 2013-10-29 15:39:56 +01:00
wvengen
cee6186c9e README fixups [ci skip] 2013-10-29 15:31:54 +01:00
wvengen
75059d5bcf split and cleanup documentation [ci skip] 2013-10-29 15:27:33 +01:00
wvengen
50d2991cc0 fix README markup 2013-10-29 14:23:37 +01:00
wvengen
c28822d33b Merge pull request #188 from foodcoops/doc_fixups
Several documentation fixups [ci skip]
2013-10-29 06:05:16 -07:00
Mathijs de Bruin
193e32f20b Deployment details / contact us. 2013-10-28 16:36:04 +01:00
Mathijs de Bruin
41e384892c Getting started guide. 2013-10-28 16:26:44 +01:00
Mathijs de Bruin
ebc3c4cb99 Whitespace cleanup. 2013-10-28 15:49:59 +01:00
Mathijs de Bruin
46a6b13e23 DEVELOPMENT *is* outdated. Link to .md docs. 2013-10-28 15:47:47 +01:00
Mathijs de Bruin
2bd559f4d9 Rename documentation to .md for proper rendering. 2013-10-28 15:47:21 +01:00
wvengen
85c98c4566 make heroku deploy work again 2013-10-28 00:49:00 +01:00
wvengen
b314363ce3 bundle update 2013-10-24 10:11:26 +02:00
wvengen
68b9f6a974 i18n-js assets configuration change 2013-10-23 12:57:42 +02:00
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