François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
François Turbelin
5ce2af454e
Clean id field
2019-07-03 23:00:36 +02:00
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
luisramos0
8daf9b9247
Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form
2019-06-18 10:49:20 +01:00
Luis Ramos
2b593a59f5
Merge pull request #3900 from luisramos0/subs_trans
...
Missing translations in Subscriptions
2019-06-13 18:51:20 +01:00
Luis Ramos
7d24bcf868
Merge pull request #3798 from m-budryte/order_cycles_add_fee_remove_link
...
the translations for Remove in the exchange forms added
2019-06-13 16:15:28 +01:00
Luis Ramos
1a2703f630
Merge pull request #3886 from luisramos0/fees_translations
...
Make a few more things translatable in the Enterprise Fees management page
2019-06-13 14:12:16 +01:00
luisramos0
d8a7f60f40
Make subs radio button visible to all managers
2019-06-11 17:21:13 +01:00
luisramos0
cfcf73b6a1
Make save and saving messages translatable in subscriptions items panel
2019-06-04 20:59:45 +01:00
luisramos0
eb42e81afc
Make some text entries translatable in create subscription pages: title in step 1 details and 4 review and date placeholders in step 1 details
2019-06-04 20:59:45 +01:00
luisramos0
64af81a4a2
Make search_by_email text translatable in subscriptions list page
2019-06-04 20:59:42 +01:00
luisramos0
32c107ab5a
move translation to use relative path so that the new translation key is used
2019-05-30 23:26:23 +01:00
Masha
436a2ba0a2
went much shorted way
2019-05-30 23:08:05 +01:00
Masha
412fffba1d
the translations for Remove in the exchange forms added
2019-05-30 23:08:05 +01:00
luisramos0
5719455731
Make enterprise fees name placeholder translatable
2019-05-29 21:33:30 +01: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
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
Kristina Lim
12b28fdc32
Remove "Debug Information" in edit OC page
2019-05-08 01:33:58 +08:00
lin-d-hop
10fba9b39f
Add translation to order cycle spinner
...
lazy text
2019-05-05 19:12:53 +01:00
Matt-Yorkley
3323ac7650
Fix duplicate error messages
2019-05-05 13:30:38 +01:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
Luis Ramos
4478d51aee
Merge pull request #3668 from luisramos0/2-0-stable-Mar29
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
Matt-Yorkley
668a37f564
Fix "clear all" button spacing in inventory
2019-04-01 12:18:19 +01:00
Matt-Yorkley
3ad2c9f7c4
Fix 'clear all' button width on Order Cycles page
2019-04-01 11:41:46 +01:00
luisramos0
527cfc1601
Merge branch 'master' into 2-0-stable-Mar29
2019-03-29 13:48:49 +00:00
Maikel
74aea76c4c
Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
...
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
Usama
698c71f039
Fixed producer profile translation bug
2019-03-22 18:25:40 -05:00
luisramos0
c0c14b16b6
Remove dynamic monthly pricing description that would come from the deleted business model configurations
2019-03-20 11:19:04 +00:00
luisramos0
77655bfffb
Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu
...
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
2019-03-12 19:11:37 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
3ddee83be5
Merge pull request #3404 from luisramos0/2-0-disable-cache
...
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
Matt-Yorkley
25e2d2adda
Update references to product_sub_menu view
2019-02-26 20:06:01 +00:00
Matt-Yorkley
777850259b
Apply and delete overrides
2019-02-26 19:42:47 +00:00
Matt-Yorkley
f1e55507c3
Recreate product_sub_menu Spree view
2019-02-26 19:42:47 +00:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Matt-Yorkley
f9ea93933e
Use localizeCurrency filter in subscriptions
2019-02-07 22:58:49 +00:00
luisramos0
1b4666fc6a
Add checkbox to cache settings to disable products cache
2019-02-07 20:06:27 +00:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
Rob Harrington
cc55f59b00
Update tag_rules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
da6dc20fcf
Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs
...
[Spree Upgrade] Fix send confirmation instructions specs
2018-12-06 16:24:40 +11:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
