Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
2243 commits 22 branches 1 tag 31 MiB
Commit graph

2243 commits

This branch
This branch
All branches
Author SHA1 Message Date
Patrick Gansterer
c6297f2864 Sort workgroups of tasks by name 2017-08-20 01:08:47 +02:00
Patrick Gansterer
6a110ca429 Show the Help link only when a help_url is set 2017-08-20 01:07:48 +02:00
Patrick Gansterer
2b1056687a Install thin gem always to have an production server for the Docker setup 2017-08-08 23:45:29 +02:00
Patrick Gansterer
251681bb66 Add option to configure SMTP server via environment variables in production.rb 2017-08-08 23:27:28 +02:00
Patrick Gansterer
d6325de35c Add support for RAILS_SERVE_STATIC_FILES to production.rb an use it with Docker 2017-08-08 23:27:28 +02:00
Patrick Gansterer
42b789d381 Create config/initializers/secret_token.rb in Dockerfile 
Set the secret_token to ENV['SECRET_KEY_BASE'] in that file.
 2017-08-08 23:27:28 +02:00
Patrick Gansterer
2c180cc9e8 Set BUNDLE_APP_CONFIG and DATABASE_URL in crontab when defined 2017-08-08 23:27:27 +02:00
Patrick Gansterer
3010dd2d90 Redirect log/production.log to /dev/stdout in Docker setup 2017-08-08 23:27:27 +02:00
Patrick Gansterer
5bc9becf9a Use a temporary mysql-server for assets precompilation during Docker build 2017-08-08 23:27:27 +02:00
wvengen
af1243ebea Fix database issue on Travis CI 
Apparently the travis user is restricted now, and something changed with
character sets. https://dev.mysql.com/doc/refman/5.7/en/charset-applications.html
 2017-08-04 17:21:57 +02:00
Patrick Gansterer
c3a49e4260 Remove unused libraries and files from Docker image 2017-08-03 00:16:51 +02:00
Patrick Gansterer
5903b4d601 Use SOURCE_COMMIT environment variable for REVISION file during Docker build 2017-07-31 23:39:13 +02:00
wvengen
6fddef354d Bundle update nokogiri and mail (CVE-2017-5029, CVE-2015-9097) 2017-07-31 23:32:19 +02:00
Patrick Gansterer
64bda5da27 Create REVISION file for Docker container 2017-07-31 23:08:55 +02:00
Patrick Gansterer
fa32fc9229 Dockerfile for production 2017-07-31 23:08:55 +02:00
wvengen
03256d28dd Merge pull request #479 from foodcoop1040/default_scope 
Fall back to default_scope if an invalid foodcoop is provided
 2017-07-12 20:47:24 +02:00
Patrick Gansterer
c312bd5ebd Fall back to default_scope if an invalid foodcoop is provided 
Before this change foodsoft redirect to the last active foodcoop, when
an invalid foodcoop is provided. After this change the default_scope
will be used all the time to avoid data disclosure.
 2017-07-08 00:09:42 +02:00
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