Em-AK
5eb42eac3c
Delete the override of a deleted field
...
https://github.com/openfoodfoundation/spree/compare/spree-upgrade-step1c...spree-upgrade-step-3#diff-a63d9d7f4c1375ca141931651f799956
2017-09-08 23:55:49 +10:00
Rohan Mitchell
ac8cfe24e6
Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR
2017-09-08 23:55:49 +10:00
Rohan Mitchell
bfaaf16030
Fix spree adjustments fix that maybe never worked?
2017-09-08 23:55:49 +10:00
Rohan Mitchell
c47af55bb9
Fix: When a user fires an event (eg. capture payment), take them back to where they came from
2017-09-08 23:55:49 +10:00
Rohan Mitchell
3ff051f238
Restore route for variant search. Fixes admin order product selection.
2017-09-08 23:55:49 +10:00
Rohan Mitchell
0a8e8dfbbb
Add specs and fix line items HTML response
2017-09-08 23:55:49 +10:00
Rohan Mitchell
1170897587
Add our own JSON handling actions for update and delete. Spree no longer does this for us.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
73abb93737
Update Spree: Bring forward simplified version of Spree.t for spree_auth_devise
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0a043a6919
Add permissions to :line_item resource, now called by Spree
2017-09-08 23:55:48 +10:00
Rohan Mitchell
2c374b448a
check_authorization removed in Spree. Add load_order before_filter to cover our custom actions.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
2a44b190fe
Use spree_paypal_express 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
3605b610fe
Use spree_auth_devise 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0219118e19
Admin JS/CSS now in spree_backend
2017-09-08 23:55:48 +10:00
Rohan Mitchell
5ad197278c
Fix rendering of order form for JSON requests
2017-09-08 23:55:48 +10:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0446b8d72f
TestingSupport moved out of Core namespace
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rohan Mitchell
48e50540db
Start Spree upgrade step 3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
8eca260297
Update Spree: Prevent duplicate copies of images appearing
2017-09-08 23:55:48 +10:00
Rohan Mitchell
017b63fa71
Update Spree: Fix further admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
efe0d3ab22
Update spree, upgrading jquery-rails to provide jquery 1.9. Fixes ng-tags-input.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
bfd54ef621
Update Spree: Fix admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
38da4c8e12
Adjustments now have state instead of locked/unlocked
2017-09-08 23:55:48 +10:00
Rohan Mitchell
b5d33fc4b5
Add migrations from Spree
2017-09-08 23:55:48 +10:00
Rohan Mitchell
f5c4537afa
Start Spree upgrade step 2
2017-09-08 23:55:48 +10:00
Saimon Moore
09aed63cd4
Add todos to remove redundant i18n keys
2017-09-08 13:57:50 +02:00
Saimon Moore
757f886af5
Use proper namespaced translations
...
... in enterprise registration wizard Type step
2017-09-08 13:35:19 +02:00
Saimon Moore
f73f0d4bf9
Use proper namespaced translations
...
... in enterprise registration wizard Details step
2017-09-08 12:50:54 +02:00
Saimon Moore
d4f7efd08a
Use proper namespaced translations
...
... in enterprise registration wizard Contact step
2017-09-08 12:49:08 +02:00
Saimon Moore
a1aac7643a
Translate Entp registration modal tab titles
...
- Add proper namespaced translations for Details and Contact tabs
2017-09-08 12:47:53 +02:00
Enrico Stano
36022fb143
Merge pull request #1815 from leandroalemao/missing-translations-edit-product-page
...
Fix i18n translation keys for Edit Product Page
2017-09-08 10:57:25 +02:00
leandroalemao
c70de9f73c
Fix i18n translation keys for Edit Product Page
2017-09-08 09:27:20 +01:00
Pau Perez
d3d4628e29
Add doc
2017-09-08 09:51:06 +02:00
Pau Perez
942ab55ddc
Disable create profile from signup when submitting
...
This prevents people re-submitting the form multiple times. Although the
backend validates it, we show an ugly alert message that is hard for
users to understand.
2017-09-07 16:02:06 +02:00
Enrico Stano
86460ffbde
Merge pull request #1792 from leandroalemao/missing-translations-new-product-page
...
Fix i18n translation keys for New Product Page
2017-09-04 16:07:15 +02:00
Leandro C
90d1d5400a
Fix i18n translation keys for New Product Page
2017-09-04 13:38:33 +01:00
Pau Perez
1b151ee015
Add missing translations in registration wizard
2017-09-01 14:57:16 +02:00
Enrico Stano
3a04136705
Merge pull request #1758 from coopdevs/simplify-karma-rake-task
...
Always execute local karma
2017-08-28 10:21:41 +02:00
Maikel
880fda7b40
Merge pull request #1775 from openfoodfoundation/transifex
...
Transifex
2017-08-25 16:48:51 +10:00
Enrico Stano
67b992cf44
Merge pull request #1771 from coopdevs/feature/add-enterprise-relationhips-tab-name
...
Translate Enterprise Relationships tab name
2017-08-23 17:40:37 +02:00
Transifex-Openfoodnetwork
a1a2a66d21
Updating translations for config/locales/fr.yml [skip ci]
2017-08-21 06:20:59 +10:00
Transifex-Openfoodnetwork
0117e2e8b5
Updating translations for config/locales/es.yml [skip ci]
2017-08-19 02:22:36 +10:00
Enrico Stano
8645b4a7f6
Translate Enterprise Relationships tab name
2017-08-18 16:40:32 +02:00
Matt-Yorkley
a76b64b80b
Spec for missing password confirmation
2017-08-18 13:59:54 +10:00
Matt-Yorkley
483db2bc29
Fix signup password confirmation
2017-08-18 13:59:54 +10:00
stveep
bd3f626872
Call toScroll after any new panel is . Also added an actual delay as it still scrolled to the 'old' location.. 10 ms was too short to allow the location to update after the old panel closes (on Chrome), 50 ms seems ok.
2017-08-18 10:51:48 +10:00
Continuous Integration
2650dc209e
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-12 20:52:20 +10:00
Julius Pabrinkis
efd3c34a0c
Change JS I18n.fallbacks to be less confusing
2017-08-12 11:21:47 +01:00
Julius Pabrinkis
3e01636f77
Add missing i18n-js partial to registration layout
2017-08-12 11:20:58 +01:00
Pau Perez
f9c0edf4b9
Always execute local karma
...
This ensure the dev will run the version specified in the package.json.
Besides, makes the rake task work as all rails tests, allowing you to
pass a RAILS_ENV.
2017-08-11 16:48:24 +02:00
