raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
f29922312d Bump test-unit from 3.3.3 to 3.3.4 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.3...3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 19:20:30 +00:00
dependabot-preview[bot]
1b8863b63d Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5 
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem) from 0.12.4 to 0.12.5.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases)
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG)
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 19:19:47 +00:00
dependabot-preview[bot]
5def2f6f5f Bump roadie-rails from 1.1.1 to 1.3.0 
Bumps [roadie-rails](https://github.com/Mange/roadie-rails) from 1.1.1 to 1.3.0.
- [Release notes](https://github.com/Mange/roadie-rails/releases)
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md)
- [Commits](https://github.com/Mange/roadie-rails/compare/v1.1.1...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-07 19:18:56 +00:00
Transifex-Openfoodnetwork
b5e69c883b Updating translations for config/locales/fr.yml 2019-11-07 23:50:03 +11:00
Transifex-Openfoodnetwork
5f0ad3fd71 Updating translations for config/locales/fr.yml 2019-11-07 23:46:53 +11:00
Pau Perez
a6ba956355 Update all locales with the latest Transifex translations v2.6.2 2019-11-07 12:47:10 +01:00
Luis Ramos
76cffe4c7f Merge pull request #4301 from Matt-Yorkley/ruby-2.2.10 
Use Ruby 2.2.10
 2019-11-07 10:17:54 +00:00
Pau Perez
5095df251e Don't test existence of a field used in next spec 
If the next example doesn't find the quick_search field it will fail so
no need to duplicate it with the consequent costly test setup.
 2019-11-06 18:28:59 +01:00
Pau Pérez Fabregat
26477a8d4b Merge pull request #4421 from openfoodfoundation/transifex 
Transifex
 2019-11-06 18:04:23 +01:00
Luis Ramos
52ab6c52bf Merge pull request #4057 from luisramos0/remove_spree_api_2 
Remove dependency to spree_api - step 2 - routes and views
 2019-11-06 13:23:32 +00:00
Luis Ramos
413e93fe40 Merge pull request #4431 from Matt-Yorkley/fix_migration_clash 
Fix migration mismatch
 2019-11-06 09:49:15 +00:00
Matt-Yorkley
9e1b2eb4ca Fix migration mismatch 
It looks like this was probably changed whilst resolving a merge conflict somewhere. The number doesn't match the last migration file, and it's breaking the ofn-install CI build (as well as migrations on fresh servers).
 2019-11-05 22:58:14 +00:00
Luis Ramos
1ceae6cf8d Merge pull request #4225 from HugsDaniel/4106-edit-product-missing-translations 
Add missing translations on product edit page
 2019-11-05 19:30:08 +00:00
Transifex-Openfoodnetwork
5183d93601 Updating translations for config/locales/en_DE.yml 2019-11-05 23:45:05 +11:00
Luis Ramos
247854b7fe Merge pull request #4423 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.1 
Bump i18n-js from 3.4.0 to 3.4.1
 2019-11-04 11:47:13 +00:00
dependabot-preview[bot]
85bd803785 Bump i18n-js from 3.4.0 to 3.4.1 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.4.0 to 3.4.1.
- [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.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-01 19:39:31 +00:00
luisramos0
75dfde2552 In the Edit OC page, the list of supplied products should only include checkboxes for normal variants: removed html to display product checkbox and also master variants 
Two rules we can use to make this more simple: all products have variants (at least what is called the standard variant) and master variants cannot be added to OCs
 2019-11-01 17:18:48 +00:00
luisramos0
10f0906689 Remove obsolete view, this code is now in app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml 2019-11-01 17:18:48 +00:00
Transifex-Openfoodnetwork
c6543edc85 Updating translations for config/locales/en_GB.yml 2019-11-02 01:42:11 +11:00
Transifex-Openfoodnetwork
a91d0973d4 Updating translations for config/locales/en_GB.yml 2019-11-02 01:39:02 +11:00
Kristina Lim
61c581ae52 Update all locales with the latest Transifex translations v2.6.1 2019-11-01 20:38:13 +08:00
Luis Ramos
db8e2891d4 Merge pull request #4417 from Matt-Yorkley/shopfront_patchination 
Ensure variants returned in #variant_relation are DISTINCT
 2019-11-01 12:16:01 +00:00
Luis Ramos
a947d8df6c Merge pull request #4397 from luisramos0/delete_option_types_page 
Remove option types menu entry
 2019-11-01 12:14:59 +00:00
Maikel
818d41ffac Merge pull request #4418 from AndrewCleve/readme-grammar-fix 
Improve readability of README.md
 2019-11-01 16:48:12 +11:00
Maikel
14f67053c8 Merge pull request #4400 from coopdevs/task-to-remove-enterprise-limit 
Task to remove limit of ent. that can be created
 2019-11-01 15:57:12 +11:00
luisramos0
76e32b126f Add a few more missing translation keys for product images and variants display as and display name 2019-11-01 10:40:02 +11:00
luisramos0
c234cfb890 Add missing translation in the new variant page 2019-11-01 10:40:02 +11:00
luisramos0
38bda1697d Add missing translations in the product variants list page 2019-11-01 10:40:02 +11:00
luisramos0
5fb9ebc594 Add missing translations for variants edit page 2019-11-01 10:40:02 +11:00
luisramos0
acbd4b076d Move product page tabs to a separate translations key namespace 2019-11-01 10:40:01 +11:00
luisramos0
123f7aa68e Use root translation keys for basic actions 2019-11-01 10:39:09 +11:00
luisramos0
2c4af84a81 Move product seo translation keys to specific namespace 2019-11-01 10:39:09 +11:00
luisramos0
34ed16ff30 Add missing translation keys to product properties list 2019-11-01 10:39:09 +11:00
Hugo Daniel
0b20b80219 Add missing translations on product edit page 2019-11-01 10:38:06 +11:00
Luis Ramos
bef745378e Merge pull request #4395 from luisramos0/delete_prototypes 
Delete prototypes tables and all references in pages
 2019-10-31 20:06:38 +00:00
lin-d-hop
472aef0904 Fixing spec 2019-10-31 18:28:13 +00:00
luisramos0
a6cb5903d6 Delete prototypes tables and all references in pages 2019-10-31 13:23:42 +00:00
Luis Ramos
d1b36aded0 Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle 
Add asterisks to required fields in New Order Cycle form
 2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93 Merge pull request #4394 from luisramos0/fix_product_sub_menu 
Merge duplicated product_sub_menu partials
 2019-10-31 12:48:27 +00:00
Matt-Yorkley
67a5a1cdc2 Fix incorrectly ordered entries with duplicate product names in OC and custom taxon ordering applied 2019-10-31 12:14:14 +00:00
Matt-Yorkley
9723e2cd49 Add failing spec for taxon ordering issue 2019-10-31 12:07:16 +00:00
Pau Pérez Fabregat
4af014df6b Merge pull request #4342 from JacksonBates/edit-button-new-window 
makes edit button action open a new tab
 2019-10-31 11:45:11 +01:00
Pau Pérez Fabregat
be6c64db75 Merge pull request #4354 from agustinariq/3832-WYSIWYG-highlight-links 
#3832 - Added color to links in WYSIWYG editor
 2019-10-31 11:44:11 +01:00
AndrewCleve
1aebc30128 Improve readability of README.md 
Made minor changes to grammar to improve consistency and readability.
 2019-10-30 19:43:38 -07:00
lin-d-hop
c1f427b0e3 Modifications for variable consistency etc 2019-10-30 19:06:49 +00:00
Matt-Yorkley
f8209ac7d5 Ensure results in #products_relation are DISTINCT 2019-10-30 19:04:28 +00:00
Matt-Yorkley
6d50176e6b Ensure results in #variants_relation are DISTINCT 2019-10-30 17:13:52 +00:00
Pau Pérez Fabregat
d6d2c19dc7 Merge pull request #4398 from Matt-Yorkley/db_indexes 
Add order_cycle_id and distributor_id indexes to spree_orders table
 2019-10-30 16:36:23 +01:00
Pau Pérez Fabregat
f897478736 Merge pull request #4402 from coopdevs/task-to-remove-unused-enterprise 
Task to remove an unused enterprise
 2019-10-30 16:34:28 +01:00
Pau Pérez Fabregat
064b86da5d Merge pull request #4407 from luisramos0/fix_sample_data 
Add tax category to sample products
 2019-10-30 15:37:53 +01:00