Commit graph

2394 commits

Author SHA1 Message Date
wvengen
841cdad010 add missing routes to wiki plugin 2013-11-02 10:57:37 +01:00
wvengen
fa0102fed5 fix gemspec after file rename 2013-11-01 20:32:30 +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
ccbf3be4a6 Merge branch 'master' into plugin-move 2013-10-30 11:06:53 +01:00
wvengen
6e9954c86f remove user referencing page as it is not being used anyway 2013-10-30 11:04:22 +01:00
wvengen
f507efcdb3 update foodsoft_wiki README [ci skip] 2013-10-30 09:51:24 +01:00
wvengen
ea71d691e9 update foodsoft_wiki README 2013-10-30 09:50:06 +01:00
wvengen
c3068c8d51 move foodsoft_wiki db migration to plugin 2013-10-30 09:43:38 +01:00
wvengen
de948d7692 fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
wvengen
e883f4cfa7 fix last commit for non-js tests 2013-10-30 01:28:59 +01:00
wvengen
042fbdc3a3 maximise window before running tests 2013-10-30 01:03:51 +01:00
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