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

200 Commits

Author SHA1 Message Date
wvengen 6188567931 hide message preferences when messages are disabled 2014-11-20 23:11:04 +01:00
wvengen c585f53f54 Merge pull request #315 from wvengen/feature/db_seeds 
more extensive database seeds (in two languages)
 2014-10-16 20:43:11 +02:00
wvengen 9e7b2321cd Merge pull request #316 from wvengen/feature/disable_config_validation 
disable config validation (closes foodcoops#313)
 2014-10-09 09:45:53 +02:00
wvengen 575928d8a3 fix use_messages heading in config screen (closes foodcoops#319) 2014-10-07 01:07:11 +02:00
wvengen a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
wvengen 0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner 8e04074cd3 Fixed I18n.locale bu in wiki page. 2014-09-23 19:04:23 +02:00
Benjamin Meichsner d9e8f29d44 Fixed number_to_currency bug in financial transaction csv export. 2014-09-22 17:37:51 +02:00
Benjamin Meichsner 9b03ac9a7c Do not fail over missing user, when building rss feed. 2014-09-22 11:02:45 +02:00
wvengen 8b83787252 simplify config loading 2014-09-11 16:40:21 +02:00
wvengen 92b6e6e28e fix encoding issue (for Ruby 1.9) 2014-09-11 14:46:50 +02:00
wvengen 3f3d7c4e3b export + encoding fix (ruby 1.9.3) 
Conflicts:
	lib/order_csv.rb
 2014-09-03 17:42:59 +02:00
wvengen 1c878c3c13 fix config issue with nested hash 2014-09-02 16:19:08 +02:00
wvengen a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +02:00
wvengen 10a193add3 make nested properties work better 2014-09-02 15:02:26 +02:00
wvengen 68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen f09ef892dc add foodsoft_config protection whitelisting 2014-09-02 15:02:25 +02:00
wvengen daae87f6d5 fix deprecation warning 2014-09-02 14:21:32 +02:00
wvengen 6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen 34e8901d04 let plugins define their own foodcoop-config defaults 2014-09-02 14:21:32 +02:00
wvengen 429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen 90f60595e6 don't fail in foodsoft_config without database, 
and use proper config defaults so that configuration editing has
sensible default values
 2014-09-02 14:21:32 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen dd3ac0971c allow to put foodcoop config in database 2014-09-02 14:21:32 +02:00
wvengen 0b08d461fa remove html escaping from all text mails 2014-09-01 11:08:32 +02:00
wvengen 790a6b1972 allow to set page break options for each document 2014-08-29 12:01:21 +02:00
wvengen 5349add890 fix fax txt table 2014-07-01 10:12:59 +02:00
wvengen 133b832d78 fix database migrations 2014-06-24 09:13:35 +02:00
wvengen 873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen 6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen ffd1c06729 fix number crash 2014-06-23 17:51:19 +02:00
wvengen c64a7ba3cd validate date and time inputs 2014-06-23 17:51:18 +02:00
wvengen ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen 34f85895c5 make multicoops:run also work on single coop 2014-05-30 12:13:09 +02:00
wvengen 0afe8bb20c fix csv export option handling 2014-05-13 18:04:57 +02:00
wvengen 724ce6ff60 make csv export more compatible with Microsoft Excel 2014-05-13 17:01:28 +02:00
wvengen 4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen 3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen 83738c8383 set config defaults for multicoops 2014-05-13 17:01:27 +02:00
wvengen 64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
wvengen 6d98be6d22 reload app config before each test 
(complements 21bef8e304d05025b72b39e790abc7e8a4f4f5e1)
 2014-05-13 17:01:26 +02:00
wvengen ed439d0b08 use minimal app_config for tests 2014-05-13 17:01:26 +02:00
wvengen 0ed867b991 optional database overrides in multicoop app_config 2014-05-13 17:01:26 +02:00
wvengen ea8e4ee560 add pdf configuration options 2014-05-13 17:01:26 +02:00
wvengen 89f4a18b24 make messages plugin work with custom navigation menu 2014-05-13 17:01:26 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen 48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen 03585e272f add configuration for default language 2014-05-13 17:01:25 +02:00
wvengen 3f032e5dd9 make apple points optional 
a next step would be to move this to a plugin
 2014-05-13 17:01:25 +02:00
wvengen bb9269f755 avoid word-wrap when showing currency 2014-03-15 16:40:53 +01:00
wvengen fccdaccb8d fix initial deploy (return value) [ci skip] 2014-03-03 17:05:01 +01:00
wvengen cd32f702b0 fix resque task user switching 2014-02-26 13:09:22 +01:00
wvengen ab514d7eb6 use encrypted cookies on new installations 2014-02-24 12:46:28 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
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