Commit graph

2412 commits

Author SHA1 Message Date
wvengen
588898d7b0 do not error when calling shared_article on non-shared article 2013-11-13 23:20:48 +01:00
wvengen
ac6b00d4f5 add unit tests for shared database synchronisation 2013-11-13 23:09:17 +01:00
tg(x)
de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +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
5daf1a466f localeapp roundtrip 2013-11-11 18:08:28 +01: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
94a9603488 avoid running specs twice in test environment 2013-11-07 21:17:53 +01:00
wvengen
ec85c1de44 doc update [ci skip] 2013-11-07 20:46:05 +01:00
wvengen
ffa994d759 fix typo 2013-11-07 20:22:56 +01:00
Mathijs de Bruin
a5e4bb8bfb Merge pull request #198 from foodcoop-adam/doc-update
Explanation of the how and what of foodsoft's application.
2013-11-07 10:12:12 -08:00
wvengen
d6f40923f6 add explanation of foodcoops to README 2013-11-07 19:08:33 +01:00
wvengen
9490357fcc fix migration name 2013-11-07 12:03:28 +01:00
wvengen
fd3aa7ebc9 move dependency to wiki plugin 2013-11-06 13:43:04 +01:00
wvengen
a27dda62e0 copy migrations to default directory instead of trying to make it more easy to use 2013-11-06 10:54:20 +01:00
wvengen
a535fbc517 allow large product lists in member order 2013-11-05 10:55:28 +01:00
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