Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,435 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

96 Commits

Author SHA1 Message Date
wvengen d92f3f2298 deploy: persist changes to session_store iniitalizer [ci skip] 2014-02-03 10:53:22 +01:00
wvengen d496c452e6 allow to enable/disable plugins in deploy 2014-01-15 21:41:54 +01:00
wvengen 46b36c42bd simplify initial database setup deployment rules 2014-01-15 21:40:51 +01:00
wvengen af3761fcf5 do not run resque verbose by default 2014-01-15 17:28:20 +01:00
wvengen ca234f0b70 deployment with Capistrano 3 (affects foodcoops#148) 2014-01-15 13:58:24 +01:00
wvengen 69a29b8296 Merge pull request #245 from fsmanuel/rss_feed + 1 2014-01-06 13:55:32 +01:00
wvengen fe111a1422 require gem in plugin 2014-01-06 13:54:56 +01:00
Manuel Wiedenmann 0d0ff90a64 adds an RSS feed for pages/all 2014-01-04 20:12:01 +01:00
Julius 3bf1392251 Show clearer error message on WikiCloth exception 2013-12-22 23:34:54 +01:00
Julius 42e983f7ee Move html markup of WikiCloth exception from locales to controller 2013-12-22 18:09:40 +01:00
Julius 496a250495 Rescue on WikiCloth exception 2013-12-22 12:17:02 +01:00
wvengen 043607f20d workaround wikicloth i18n issue (closes foodsoft#217) 2013-12-06 16:41:16 +01:00
wvengen 9badaca2f3 fix wiki page creation 2013-11-25 16:33:12 +01:00
wvengen 5adb25caf5 copy wiki strings to plugin area 2013-11-19 18:33:54 +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 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 94a9603488 avoid running specs twice in test environment 2013-11-07 21:17:53 +01:00
wvengen fd3aa7ebc9 move dependency to wiki plugin 2013-11-06 13:43:04 +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 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 70c12b7c1f move wiki functionality to plugin 2013-10-29 22:42:06 +01:00
wvengen 6d0ba985aa first version of the foodsoft_wiki plugin 2013-10-29 22:22:24 +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 6632f5ed75 workaround migration bug introduced by 975bcdec3a 2013-09-30 11:01:15 +02:00
Benjamin Meichsner 975bcdec3a Avoid send messages so STDOUT in rake silen mode. 2013-09-25 11:57:22 +02:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
Benjamin Meichsner 4c27a98e06 Fixed failing asset precompiling in production mode. 2013-09-18 18:19:41 +02:00
wvengen 707f487128 update spec gems to make tests work again 2013-09-07 01:34:34 +02:00
wvengen 7de57715f2 Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
 2013-09-07 01:11:24 +02:00
Benjamin Meichsner 3792069fda Fxed encoding error when uploading files with non-ascii characters. 2013-09-02 16:46:44 +02:00
Benjamin Meichsner a1d85d0dd7 Changed API of multicoops rake tasks. Use TASK=sample:task 
Fixed running rake task without multicoops wrapper.
 2013-09-02 14:19:44 +02:00
wvengen bb20e9abea Merge branch 'master' into tests-rspec 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-24 21:25:36 +02:00
wvengen 6da2fdee6d add travis-ci configuration 2013-07-24 13:21:52 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
Robert Waltemath a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Manuel Wiedenmann 2c1d9aeb9c finishes i18n set_locale with user settings 2013-06-14 02:39:25 +02:00
Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +02:00
Manuel Wiedenmann c8c810a0a4 added user setting to set_locale 2013-06-07 19:05:28 +02:00
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
Manuel Wiedenmann 47405b5b19 fixes locales issue 2013-06-06 03:18:02 +02:00
Manuel Wiedenmann c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en 2013-05-31 18:42:28 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 21c7fa40c1 adds a foodsoft:setup_development rake task 2013-05-26 14:02:16 +02:00
wvengen d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02:00
Robert Waltemath 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks 
Conflicts:
	Gemfile
	db/schema.rb
 2013-03-15 17:59:19 +01:00
Benjamin Meichsner 1fe141175c Fixed multicoops and resque rake tasks. 2013-01-07 13:44:46 +01:00