Commit graph

2376 commits

Author SHA1 Message Date
wvengen
e366605dbe Merge pull request #478 from foodcoop1040/god
Fix order by groups document after 020b75c
2017-06-28 21:12:48 +02:00
Patrick Gansterer
4713539a09 Fix order by groups document after 020b75c
Use a OUTER JOIN instead of a INNER JOIN to include also the stock order
which does not have an entry in the groups table.
2017-06-28 13:53:38 +02:00
wvengen
8f8b5b93a4 Continue development after release 2017-04-14 12:37:04 +02:00
wvengen
b23ade7fc2 Bumped new version: 4.5.2 2017-04-14 12:36:33 +02:00
wvengen
e73bf9c7cb Localeapp roundtrip 2017-04-14 12:34:02 +02:00
Robin Schneider
897d31e340 Install all dependencies in an authenticated way (https)
git:// is unauthenticated!!!
2017-04-10 09:26:33 +02:00
wvengen
4f30248a49 Allow to run without Redis in development 2017-04-01 19:11:52 +02:00
wvengen
c8999333a6 Localeapp roundtrip 2017-04-01 16:51:05 +02:00
wvengen
240decb4f3 Relax deface version (fixes USN-3235-1) 2017-04-01 16:09:27 +02:00
wvengen
b857b10814 Fix specs after update (switching to webkit) 2017-04-01 15:18:56 +02:00
wvengen
ddf7402a3b Bundle update (includes CVE-2017-5946) 2017-04-01 15:18:56 +02:00
Tom Carchrae
0779ccd193 Add missing confirm translation (fixes #467, PR #469) 2017-03-21 16:22:36 +01:00
Patrick Gansterer
8ed87730a8 Fix listing of shared suppliers 2017-03-04 13:17:46 +01:00
Patrick Gansterer
04a833a5f5 Allow ERB syntax in the app_config.yml
This change allows us to refer to envrionment variables in the yml file.
This is helpful if passwords are passed as environment variables in
Docker installations to avoid plain passwords in configuration files.
2017-03-04 13:17:22 +01:00
wvengen
e5cec637fc Merge pull request #463 from foodcoop1040/user_display
Show User.display instead of User.name when showing messages
2017-02-16 09:04:19 +01:00
Patrick Gansterer
1f979c3f66 Show User.display instead of User.name when showing messages 2017-02-16 08:33:27 +01:00
wvengen
c32593d682 Merge pull request #462 from foodcoop1040/message_undeleted
Send messages only to users which have not been deleted
2017-02-16 00:24:57 +01:00
Patrick Gansterer
d48eecd6fe Send messages only to users which have not been deleted 2017-02-15 23:47:10 +01:00
wvengen
504c8b6192 Merge pull request #459 from foodcoop1040/smtp
Add SMTP server for handling reply emails
2017-02-15 11:31:17 +01:00
Patrick Gansterer
12bc5f9ab7 Add documentation for receiving mails to the README of the messages plugin 2017-02-15 10:41:03 +01:00
Patrick Gansterer
56d121e02e Fix FoodsoftConfig.each_coop after 4e35e2d 2017-02-15 09:52:37 +01:00
Patrick Gansterer
57bfd542b4 Fix create_upcoming_periodic_tasks after 9ae7c05 2017-02-15 09:52:16 +01:00
Patrick Gansterer
ef5b5a11a2 Add reply_email_smtp_server task 2017-02-04 07:20:32 +01:00
Patrick Gansterer
3a49e79548 Add mini-smtp-server gem dependency 2017-02-04 07:17:17 +01:00
Patrick Gansterer
4817ab6452 Move command line mail handling into separate function 2017-02-04 07:16:50 +01:00
wvengen
46275fa564 Merge pull request #458 from foodcoop1040/break
Hide break in shared group template if empty
2017-02-03 23:05:22 +01:00
wvengen
d330b57b8a Merge pull request #457 from foodcoop1040/translations
Fix translations of messages plugin
2017-02-03 23:04:29 +01:00
Patrick Gansterer
e0dbd396e1 Hide break in shared group template if empty 2017-02-03 20:30:28 +01:00
Patrick Gansterer
eb2fc56fc8 Fix translations of messages plugin
We need to copy the locales of overrides into the main locales files
to work properly. Also add the missing German translations.
2017-02-03 20:25:00 +01:00
wvengen
571d927360 Merge pull request #454 from foodcoop1040/done
Make sure that newly created periodic task are not done
2017-01-28 17:09:34 +01:00
wvengen
1410e242a4 Merge pull request #455 from foodcoop1040/confirm_delete
Fix UI string for confirm_delete in documents plugin
2017-01-28 17:09:13 +01:00
Patrick Gansterer
a7f86dd0cd Fix UI string for confirm_delete in documents plugin 2017-01-26 22:49:13 +01:00
Patrick Gansterer
1056b86f9d Make sure that newly created periodic task are not done 2017-01-26 20:54:53 +01:00
wvengen
2072fbb4d5 Allow plugins to override some document prices 2017-01-21 22:44:11 +01:00
Patrick Gansterer
c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
Patrick Gansterer
925727d3ae Show button for creating invoices also at finished orders
Check if a order is not opened instead of checking if it is closed.
2017-01-21 22:42:16 +01:00
Patrick Gansterer
233ed415c7 Add "Copy" button for settled orders #383 2017-01-21 22:41:44 +01:00
Patrick Gansterer
e742958c0c Add missing German translations 2017-01-21 22:41:18 +01:00
wvengen
1ba84f03d5 Merge pull request #444 from foodcoop1040/docker
Add missing dependency in Dockerfile
2016-10-15 11:43:27 +02:00
Patrick Gansterer
ad2f2c5ead Add missing dependency in Dockerfile 2016-10-14 18:14:41 +02:00
wvengen
22aa9cd84a Fix changelog markup 2016-08-12 21:51:41 +02:00
wvengen
7009b36a64 continue development after release 2016-08-12 16:03:48 +02:00
wvengen
a7b6b0c803 Bumped new version: 4.5.1 2016-08-12 16:03:20 +02:00
wvengen
36706511c0 Be a bit more safe displaying stock ordergroup 2016-08-12 15:56:45 +02:00
wvengen
d06a9ed3f0 Fix dynamic select2 usage (oops!) 2016-08-12 15:54:28 +02:00
wvengen
326016dfb5 Fix tricky i18n error on html render (not js) 2016-08-09 20:38:55 +02:00
wvengen
bd22da50a6 Fix missing asset in wiki 2016-08-08 21:17:42 +02:00
wvengen
fc32c12ccd continue development after release 2016-06-28 20:53:21 +02:00
wvengen
bf62abefbc Bumped new version: 4.5.0 2016-06-28 20:50:48 +02:00
wvengen
0d309af5f6 Update translations from localeapp 2016-06-28 20:43:53 +02:00