Commit Graph

65 Commits

Author SHA1 Message Date
wvengen 42eb6c8509 Make ordergroup break fields a bit nicer 2016-03-11 13:56:02 +01:00
Patrick Gansterer 253512eb51 Add break to ordergroup
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
wvengen d358278333 Merge pull request #416 from foodcoop1040/invite_config
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
Patrick Gansterer e16a0fb336 Add config option to disable the invites
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
Patrick Gansterer c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer 0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer b05ac2ab64 Add deleted_at for User
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
wvengen d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer 1315103a7d Add role_invoices
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
wvengen a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen de794a48b0 Reorder roles and add icons 2015-04-04 10:56:42 +02:00
Patrick Gansterer 700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
wvengen cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen 219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen 68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
wvengen 668ba1e5d6 add webstats_tracking_code to configuration screen (closes foodcoops#311) 2014-09-22 09:36:36 +02:00
wvengen 1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen cf680d3410 add page break to config screen 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 3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen 7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen 3953c21ae2 use capture instead of layout-hack to allow deface overrides 2014-05-13 17:01:27 +02:00
Robert Waltemath 7556c753d0 Extract message system to plugin. 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 7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen 3e1d561a5e fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
wvengen d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen 9ba425aafa fallback for when nick is nil 2013-10-29 19:05:24 +01:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +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
wvengen 1e984df3aa more beautiful ordergroup edit form 2013-06-18 01:35:12 +02:00
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
Manuel Wiedenmann 64b3d7e17d finished admin/users i18n + dry the admin i18n 2013-02-04 01:38:18 +07:00
Manuel Wiedenmann 75c9338fd9 finished admin/workgroups i18n 2013-02-04 00:36:03 +07:00
Manuel Wiedenmann e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann 42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni cd91436f7f Allow ignoring apple restriction for specific ordergroup. 2012-09-30 13:34:16 +02:00
benni 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni a27c0c67fc Fixed some typos. 2011-06-10 13:31:01 +02:00
benni 172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni 6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni 689cfcfe01 Fixed items_per_page helper. 2011-06-10 12:03:32 +02:00
benni a47d4b1f0e Unobtrusive pagination_links_remote 2011-06-10 11:43:56 +02:00