raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,845 Commits 15 Branches 453 Tags
57504f42d89f092a46b52346bd63e6a7104329ac
Commit Graph

21845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
luisramos0
fe017713ae Run transpec in spec/serializers 2019-05-09 22:43:07 +01:00
luisramos0
04801e5c2e Run transpec in spec/models 2019-05-09 22:25:29 +01:00
Luis Ramos
59e7cb313d Merge pull request #3815 from amers185/add_social_links 
Add extra (Instagram) social media links to emails sent to customers and users [Looking for feedback/direction on completing solution]
 2019-05-09 21:14:42 +01:00
dependabot[bot]
ef3ea0701e Bump i18n-js from 3.2.1 to 3.2.2 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-09 19:19:16 +00:00
Luis Ramos
6d62f4c4b4 Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information 
1218 Remove OC "Debug Information" which appears in non-production environments
 2019-05-09 16:05:18 +01:00
Luis Ramos
19881927e3 Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub 
Add review & edit sub keys
 2019-05-09 16:04:38 +01:00
Luis Ramos
24c96fab8b Merge pull request #3795 from lin-d-hop/translation-oc-spinner 
Add translation to order cycle spinner
 2019-05-09 16:03:53 +01:00
Luis Ramos
b821188f5d Merge pull request #3826 from luisramos0/knapsack 
Add new knapsack report to get the build jobs more balanced
 2019-05-09 16:00:38 +01:00
Maikel
7d163632a4 Merge pull request #3827 from openfoodfoundation/transifex 
Transifex
 2019-05-09 17:39:26 +10:00
Maikel Linke
a97792cbc3 Remove story from code comment 2019-05-09 11:57:13 +10:00
Eelco de Vlieger
d498ecf901 Issue 3450 - webdrivers update. 
Ran `bundle install` to update Gemfile.lock (suggestion by semaphoreci check)
Moved webdrivers gem down in the list to be in better alphabetical order (suggested by codeclimate check)
 2019-05-08 22:28:31 +01:00
Transifex-Openfoodnetwork
5ea9d8cf8b Updating translations for config/locales/de_DE.yml 2019-05-09 06:29:23 +10:00
Transifex-Openfoodnetwork
9abd60ef1e Updating translations for config/locales/de_DE.yml 2019-05-09 06:26:14 +10:00
luisramos0
ca5eddd27e Add new knapsack report to get the build jobs more balanced 2019-05-08 19:59:17 +01:00
Eelco de Vlieger
2900dd89d8 issue 3450 - update webdrivers version - version 3.9 was released yesterday, which caused a test error, so setting version to latest 3.8.1 for now 2019-05-08 19:50:36 +01:00
Eelco de Vlieger
5667c00587 issue 3450 - add webdrivers dependency (+ spec helper setup) and remove chromedriver-helper dependency 
https://github.com/openfoodfoundation/openfoodnetwork/issues/3450
 2019-05-08 19:10:14 +01:00
eelcodevlieger
295e814988 Merge pull request #1 from openfoodfoundation/master 
sync
 2019-05-08 18:59:26 +01:00
Masha
5eacf05a45 used string interpolation for clarity 2019-05-08 15:05:15 +01:00
Masha
d5ff733f0b spaces location swapped 2019-05-08 15:05:13 +01:00
Masha
5470f8d758 new translation key for products_or created 2019-05-08 15:03:28 +01:00
Masha
94cbac00a5 & replaced by OR when multiple property filters are selected 2019-05-08 15:00:59 +01:00
luisramos0
77178ca595 Add href and target attributes to product serializer sanitizer to allow links with target in product descriptions 2019-05-08 14:46:57 +01:00
idanceinbetween
7790401d59 added buttons to form and updated sanitizer to allow extra formatting 2019-05-08 14:45:05 +01:00
Pau Pérez Fabregat
a45782f59b Merge pull request #3814 from coopdevs/test-bulk-update-error 
Test empty variants_attrs in bulk_update
 2019-05-08 15:43:09 +02:00
Maikel
a0f60a9bfe Merge pull request #3806 from openfoodfoundation/transifex 
Transifex
 2019-05-08 15:50:50 +10:00
Maikel Linke
a3adbd9fc8 Replace connect-learn banner with custom content 
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.

Translations in custom content are an existing feature request,
"multi-lang 2.0".
 2019-05-08 11:38:49 +10:00
Luis Ramos
4c767cd5b4 Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations 
3760 Optimizations related to OCs
 2019-05-07 21:12:44 +01:00
Luis Ramos
6658f85f59 Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation 
3292 link popup text translation
 2019-05-07 21:11:31 +01:00
Luis Ramos
dffa50468b Merge pull request #3801 from Matt-Yorkley/need_for_speed 
Fix /maps performance
 2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32 Remove "Debug Information" in edit OC page 2019-05-08 01:33:58 +08:00
Pau Pérez Fabregat
fc38906e60 Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category 
[Spree Upgrade] shipping_category now required for products
 2019-05-07 16:12:05 +02:00
Matt-Yorkley
fc8b220b4c Add specs for endpoint and serializers 2019-05-07 10:27:04 +01:00
Transifex-Openfoodnetwork
13985e28f4 Updating translations for config/locales/pt.yml 2019-05-07 19:01:37 +10:00
Transifex-Openfoodnetwork
8f62cf2bce Updating translations for config/locales/pt.yml 2019-05-07 19:01:29 +10:00