Hugo Daniel
353d6fbc5f
Import variants/index from spree_backend to ofn and convert to Haml
2019-07-24 16:57:11 +02:00
Luis Ramos
1f75c7e5e4
Merge pull request #4047 from luisramos0/undeface
...
De-deface some admin configuration pages and the general admin layout and menu
2019-07-23 18:36:09 +01:00
Luis Ramos
77fb73f802
Merge pull request #4065 from coopdevs/get-latest-spree-revision
...
Brings in the latest Spree fork's Git commit
2019-07-23 14:28:49 +01:00
Pau Perez
9f7376a5ae
Brings in the latest Spree fork's Git commit
...
This successfully closes #3903 by bringing in the changes done in
https://github.com/openfoodfoundation/spree/pull/41 .
2019-07-23 14:56:33 +02:00
Luis Ramos
eae373ef4b
Merge pull request #4061 from openfoodfoundation/revert-3938-get-last-spree-fork-patch
...
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:06:10 +01:00
Luis Ramos
465332d5f9
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:05:41 +01:00
Luis Ramos
e98b89625f
Merge pull request #3938 from openfoodfoundation/get-last-spree-fork-patch
...
Handle soft deleted variants in order edit
2019-07-22 21:05:12 +01:00
Pau Perez
be4fbc4d23
Update Gemfile to get spree from a feature branch
...
This allows us to test
https://github.com/openfoodfoundation/spree/pull/41 . If it passes
testing I will then revert it back to the `2-0-4-stable` branch but
updating the target commit in the Gemfile.lock.
2019-07-22 15:40:31 +02:00
Luis Ramos
a6a695660f
Merge pull request #4002 from luisramos0/more_rails4
...
Adapting queries in permissions to Rails 4
2019-07-19 15:17:01 +01:00
Luis Ramos
0058ef5e04
Merge pull request #4048 from idanceinbetween/4034
...
Add grey line below nav bar, change logo img max height 44px
2019-07-19 12:13:14 +01:00
Luis Ramos
4831bae9cb
Merge pull request #3953 from mkllnk/3727-first-credit-card-default
...
First stored credit card becomes default again
2019-07-19 12:12:09 +01:00
Luis Ramos
f7679780de
Merge pull request #4032 from luisramos0/subs_oc_date_issue
...
3544 Add date format to moment date conversion
2019-07-18 19:52:49 +01:00
luisramos0
f2ac354e00
Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it
2019-07-18 14:29:38 +01:00
Maikel
88ffa46ce7
Merge pull request #4045 from openfoodfoundation/transifex
...
Transifex
2019-07-18 16:35:41 +10:00
Maikel
869431c68d
Merge pull request #3926 from mkllnk/report-missing-payments
...
Add rake task to report lost payments
2019-07-18 15:01:14 +10:00
Maikel
a1f8530489
Merge pull request #3962 from luisramos0/first_view_spec
...
First 2 view specs in OFN
2019-07-17 10:57:58 +10:00
luisramos0
6064f096a7
Fix a pre-existing problem in orders_tab by moving the links in to the li elements
2019-07-16 20:16:32 +01:00
luisramos0
a62fa755f5
Remove page_title_classes as it is breaking the rendering of the classes attribute and it is no longer used
2019-07-16 20:16:32 +01:00
luisramos0
fa25991f0f
Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving
2019-07-16 20:16:32 +01:00
luisramos0
6f2be1dfa6
Fix issue in layouts/admin view, make classes compute correctly
2019-07-16 20:16:32 +01:00
luisramos0
c81a9fd032
Fix error in js tag in head
2019-07-16 20:16:32 +01:00
luisramos0
665d0cc86b
Fix error related to missing _hamlout method by replacing code with standard haml
2019-07-16 20:16:32 +01:00
luisramos0
a34d8a3f20
Revert "Move app_wrapper deface to spree/layouts/admin view"
...
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
2019-07-16 20:16:32 +01:00
luisramos0
6e35701dd6
Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view
2019-07-16 20:16:32 +01:00
luisramos0
9991458d2a
Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used
2019-07-16 20:16:32 +01:00
luisramos0
a843fd73b7
Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view
2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908
Move admin/shared/_head/replace_spree_title deface to head view
2019-07-16 20:16:32 +01:00
luisramos0
5ccadc1f7d
Convert spree/admin/shared/_head view from erb to haml
2019-07-16 20:16:32 +01:00
luisramos0
539805e2c2
Bring spree/admin/shared/head partial from spree_backend
2019-07-16 20:16:32 +01:00
luisramos0
fac64ef5bf
Remove layouts/spree_application/inside_head deface, this view is in spree_frontend which is not used in ofn anymore
2019-07-16 20:16:32 +01:00
luisramos0
a17a0a62bc
Move spree/layouts/bare_admin/add_login_nav deface to layout/bare_admin view
2019-07-16 20:16:32 +01:00
luisramos0
1e91de106f
Move admin html head deface to layout admin view and remove repeated (in shared/head partial) content type tag
2019-07-16 20:16:32 +01:00
luisramos0
73252132a6
Move add_i18n_script deface to layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
e3c383c61c
Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view
2019-07-16 20:16:32 +01:00
luisramos0
aafb134be7
Move spree/layouts/admin/ tabs deface to spree/layout/admin view
2019-07-16 20:16:32 +01:00
luisramos0
70a1996435
Move add_currency_config deface to spree/layout/admin view
2019-07-16 20:16:31 +01:00
luisramos0
1712cb2617
Move app_wrapper deface to spree/layouts/admin view
...
In admin layout, only adds a div after the body tag.
2019-07-16 20:16:31 +01:00
luisramos0
25df057d05
Move spree/layouts/admin/add_analytics deface to spree/layouts/admin view
2019-07-16 20:16:31 +01:00
luisramos0
24a9991162
Convert views/spree/layouts/admin.html from erb to haml
2019-07-16 20:16:31 +01:00
luisramos0
156ff2da89
Bring spree/layouts/admin from spree_backend to de-deface it
2019-07-16 20:16:31 +01:00
luisramos0
e36b4ed01a
Move temp_controller_list deface to shipping_categories index view
2019-07-16 20:16:23 +01:00
idanceinbetween
41b775b173
Remove multiline
2019-07-16 20:10:18 +01:00
idanceinbetween
35570feba0
Comment out new changes
2019-07-16 20:04:50 +01:00
idanceinbetween
1d8cfe59a2
Change hex value to variable
2019-07-16 19:37:08 +01:00
idanceinbetween
abd3efe82a
Replace lightgray to hex
2019-07-16 19:32:19 +01:00
idanceinbetween
389b53cb71
Add grey line below nav bar, change logo img max height 44px
2019-07-16 19:14:10 +01:00
luisramos0
4f60273198
Move temperature_controlled_form_element deface to shipping_categories form view
2019-07-16 14:50:16 +01:00
luisramos0
856fa8685a
Convert spree/admin/shipping_categories views from erb to haml
2019-07-16 14:48:47 +01:00
luisramos0
9ac4c0ba30
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
2019-07-16 14:46:26 +01:00
luisramos0
2709f237f5
Move image_format deface to image settings view
2019-07-16 14:44:38 +01:00
