Commit graph

1995 commits

Author SHA1 Message Date
wvengen
dbdc7ae4aa Workaround occasional mailer test failure 2015-01-14 20:57:43 +01:00
wvengen
2687da357a Fix mailer warnings 2015-01-13 18:02:30 +01:00
wvengen
8a4b65c4a5 Add test for reset password 2015-01-13 17:59:31 +01:00
wvengen
cfdfe5f23e Improve header+footer in PDFs 2015-01-03 00:24:33 +01:00
wvengen
d1ece157c6 Get rid of last empty page in PDFs 2015-01-03 00:24:33 +01:00
wvengen
68f56a55e5 Merge pull request #333 from foodcoops/feature/plugin-uservoice
Add uservoice plugin
2015-01-02 23:22:12 +01:00
wvengen
1b9b81fa75 Make sync work when unit has no name
(closes foodcoops#337)

Conflicts:
	app/models/article.rb
2015-01-02 23:20:36 +01:00
wvengen
cec5a93c82 Speedup Travis build a little 2015-01-02 18:23:49 +01:00
wvengen
a048e5f4be Remove rspec-rerun workaround 2015-01-02 18:12:57 +01:00
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
7bc9d0ede6 Upgrade to rails 4.2 2015-01-02 17:43:44 +01:00
wvengen
8777830029 Add unit: bag 2015-01-02 17:11:02 +01:00
wvengen
80cb806122 continue development after release 2014-12-31 14:28:36 +01:00
wvengen
8fca19a2a1 Bumped new version: 4.3.0 2014-12-31 14:27:56 +01:00
wvengen
3e6a882268 Don't provide default date when schedule is unset 2014-12-31 14:24:55 +01:00
wvengen
6272816358 Localeapp roundtrip 2014-12-31 13:11:39 +01:00
wvengen
1c0db4374f Merge pull request #332 from foodcoops/feature/edit-address
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
f72da3b5c9 Add uservoice plugin 2014-12-16 22:43:46 +01:00
wvengen
bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen
86eee94249 Add hint for ordergroup address in user form 2014-12-16 20:53:38 +01:00
wvengen
b080fb5fda bundle update 2014-12-15 21:15:47 +01:00
wvengen
0aa098e75b localeapp roundtrip 2014-12-15 21:11:41 +01:00
wvengen
8e4f3a4caf Increase account_balance precision (closes foodcoops/foodsoft#322) 2014-12-11 22:12:19 +01:00
wvengen
12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen
56f6efa590 Allow to edit address from user profile 2014-12-10 21:27:53 +01:00
wvengen
7ac3f54709 bundle update 2014-12-10 20:07:26 +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
a278004c11 Merge pull request #330 from foodcoops/feature/plugin-move
Move plugins to separate directory.
2014-12-02 23:37:22 +01:00
wvengen
e63a34edd3 Merge pull request #329 from foodcoops/feature/order-schedule
Allow to specify an order schedule for new orders.
2014-12-02 23:37:02 +01:00
wvengen
5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +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
6aa8ee7968 Move plugins to separate directory. 2014-11-22 00:43:24 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
6188567931 hide message preferences when messages are disabled 2014-11-20 23:11:04 +01:00
wvengen
d83ce60516 Merge pull request #323 from wvengen/feature/sudo
sudo functionality
2014-11-17 16:46:55 +01:00
wvengen
68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen
7826d2f674 move login and logout to separate methods
Conflicts:
	app/controllers/sessions_controller.rb

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
2014-10-18 17:57:07 +02:00
wvengen
fe38e168bd bundle update 2014-10-16 20:57:44 +02: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
51830f6ca4 continue development after release 2014-10-14 18:42:19 +02:00
wvengen
071dd326fc Bumped new version: 4.2.0 2014-10-14 18:41:04 +02:00
wvengen
e9dcaadb06 localeapp roundtrip 2014-10-14 18:39:05 +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
9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen
575928d8a3 fix use_messages heading in config screen (closes foodcoops#319) 2014-10-07 01:07:11 +02:00
Benjamin Meichsner
b961037fff Fixed broken login#update_password route. 2014-10-05 20:35:28 +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