raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 20 Branches 451 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
5858a83239 Simplify spec_helper config to make file downloads work in headless chrome 2019-05-23 20:31:52 +01:00
Luis Ramos
4a321f200f Merge pull request #3783 from kristinalim/fix/3782-missing_translation 
3782 Fix missing translation in subscription update modal
 2019-05-23 18:45:20 +01:00
Luis Ramos
ae1d260729 Merge pull request #3810 from openfoodfoundation/dependabot/bundler/deface-1.0.2 
Bump deface from 1.0.0 to 1.0.2
 2019-05-23 18:42:51 +01:00
luisramos0
15360971b0 Move signed_* files to views/shared/menu and add new logged in and profile icons 2019-05-23 15:58:02 +01:00
Luis Ramos
12282ad906 Merge pull request #3794 from m-budryte/replace_&_with_OR 
& replaced by OR when multiple property filters are selected
 2019-05-23 14:35:51 +01:00
Transifex-Openfoodnetwork
a4d59b72b0 Updating translations for config/locales/nb.yml 2019-05-23 20:35:12 +10:00
Transifex-Openfoodnetwork
6b2e10860e Updating translations for config/locales/nb.yml 2019-05-23 20:32:02 +10:00
Maikel Linke
c93e51b73e Update source locale description 
The Australian instance has been using the source locale. But now we
added an Australian English locale via Transifex.

The I18n wiki page moved as well.
 2019-05-23 20:14:59 +10:00
Transifex-Openfoodnetwork
3c162984f1 Updating translations for config/locales/en_AU.yml 2019-05-23 19:57:49 +10:00
Transifex-Openfoodnetwork
207fe7b64e Updating translations for config/locales/en_AU.yml 2019-05-23 19:54:40 +10:00
Pau Pérez Fabregat
7c9299bdb5 Merge pull request #3852 from openfoodfoundation/transifex 
Transifex
 2019-05-22 16:35:27 +02:00
Pau Perez
4c19c1a0a5 Disable harmful rake tasks in production 
No need to check whether you are running that `bundle exec rake db:reset`
command on staging or production anymore 😱.

As described in https://github.com/adamcooke/rails-safe-tasks

> This gem provides an extra layer of safety between you and deleting all your
> production data by accident.

> It restricts the use of various rake tasks (including db:drop, db:reset etc...)
> when you are running your application in a production environment.
 2019-05-22 15:30:43 +02:00
Maikel Linke
38e9976ce4 Make inserting delayed jobs from cron quiet 
`config/schedule.rb` defines entries for cron jobs. Every five minutes
it insert several delayed jobs via `script/enqueue`. A recent upgrade of
Postgresql (a year or two ago) made that script noisy. Every time we
insert a delayed job with that script it outputs:

  INSERT 0 1

Standard output like this is seen as error message by cron an forwarded
to the unix user's local mailbox in `/var/mail/openfoodnetwork`. This
file grows over time and accumulates tens of thousands of error
messages, hiding any important failures.

This patch makes inserting delayed jobs quiet. A failure is still
reported.
 2019-05-22 03:36:07 +10:00
Matt-Yorkley
74d7db9fba Allow unauthenticated access to enterprise API endpoints 2019-05-21 17:13:00 +01:00
Drumstickx
414ae58cbd Rubocop changes. 2019-05-21 16:48:02 +02:00
Drumstickx
c162654757 Reduce code duplication. 2019-05-21 16:46:40 +02:00
Drumstickx
29f68ed5d8 Rubocop changes. 2019-05-21 14:51:52 +02:00
luisramos0
115b5dadef Remove more dead code from usersregistration (signup calls are always ajax) 2019-05-21 12:39:29 +02:00
luisramos0
d9438cb082 Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets 2019-05-21 12:39:29 +02:00
luisramos0
ffd883e84d Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it 2019-05-21 12:39:29 +02:00
luisramos0
25fd6f2e78 Move empty check template from spree_frontend, it is required from the checkout page 
This makes ofn code completely independent from spree_frontend views
 2019-05-21 12:39:29 +02:00
luisramos0
a0c56f31c7 Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code 2019-05-21 12:39:29 +02:00
Transifex-Openfoodnetwork
85c41c1f12 Updating translations for config/locales/pt.yml 2019-05-21 20:18:30 +10:00
Transifex-Openfoodnetwork
d252916858 Updating translations for config/locales/pt.yml 2019-05-21 20:15:53 +10:00
Transifex-Openfoodnetwork
09a9b64d28 Updating translations for config/locales/pt.yml 2019-05-21 20:15:20 +10:00
Transifex-Openfoodnetwork
31c1c82310 Updating translations for config/locales/fr.yml 2019-05-21 20:10:37 +10:00
Transifex-Openfoodnetwork
a66c2314ef Updating translations for config/locales/fr.yml 2019-05-21 20:07:31 +10:00
Drumstickx
2f83d02168 Reduce code duplication. 2019-05-19 22:36:55 +02:00
Drumstickx
0e6a576e33 Fix user_id IS NOT NULL check. 2019-05-19 22:05:34 +02:00
Drumstickx
4204943a7c Styling. 2019-05-19 22:04:44 +02:00
Drumstickx
1246c3b6b9 Styling. 2019-05-19 18:57:09 +02:00
Drumstickx
ec2db4dd2a Fixed sql injection vulnerability in users_and_enterprises_report. 2019-05-19 17:58:57 +02:00
Transifex-Openfoodnetwork
ec343fda3b Updating translations for config/locales/en_GB.yml 2019-05-15 05:58:11 +10:00
Transifex-Openfoodnetwork
ff3e8c29a7 Updating translations for config/locales/en_GB.yml 2019-05-15 05:55:01 +10:00
lin-d-hop
f19244cebd Update outdated things on the README 2019-05-14 15:25:05 +01:00
Pau Pérez Fabregat
59d4e3d9e2 Merge pull request #3848 from luisramos0/pr_3813 
Get PR 3813 to master (it was only on the hotfix branch 2-0-1)
 2019-05-13 19:15:24 +02:00
luisramos0
189865fd80 Make stock locations backorderable_default false. 
This is required because when the default stock location is created, the backorderable_default column doesnt exist and when this column is created, the initial default is true. This is why we need to force it to false here. This column is the default value for on_demand which must be false.
 2019-05-10 22:00:24 +01:00
Pau Pérez Fabregat
7e9a149c8d Merge pull request #3837 from luisramos0/transpec 
transpec!!!
 2019-05-10 14:59:41 +02:00
Pau Pérez Fabregat
f113ac61d7 Merge pull request #3839 from coopdevs/report-cache-diff-in-new-tab 
Report cache diff in new tab
 2019-05-10 14:38:33 +02:00
Pau Perez
9a98a7c974 Report cache diff to Bugsnag in a new tab 
This will allow us to see the difference between the cache entry and the
actual shopfront. Otherwise, there is no way to see what wasn't
refreshed in the cache.
 2019-05-10 13:13:20 +02:00
luisramos0
07e9043e34 Move shipping methods translations to lazy lookups 2019-05-10 11:44:49 +01:00
Luis Ramos
f844ff275b Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757 
added buttons to form and updated sanitizer to allow extra formatting
 2019-05-10 10:48:55 +01:00
Maikel
50ca1f7173 Merge pull request #3824 from mkllnk/aus-content-updates 
Aus content updates
 2019-05-10 10:40:09 +10:00
luisramos0
6996353d05 Run transpec for spec/controllers 2019-05-10 01:20:40 +01:00
luisramos0
df459a21a4 Run transpec for spec/lib 2019-05-10 01:08:34 +01:00
luisramos0
e7c6892ab8 Run transpec for spec/mailers 2019-05-09 23:47:32 +01:00
luisramos0
2c6ca7e169 Run transpec for spec/helpers 2019-05-09 23:43:51 +01:00
luisramos0
0075ffbc02 Run transpec for spec/support 2019-05-09 23:39:30 +01:00
luisramos0
9cfba8ad19 Revert transpec in ability_spec.rb:461 so that spec is green again 2019-05-09 23:33:43 +01:00
luisramos0
6dcc0b1d68 Run transpec for spec/jobs 2019-05-09 23:29:11 +01:00