luisramos0
|
ae0563a58f
|
Merge branch 'master' into 1766-registration-scroll
|
2019-06-13 19:10:05 +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
|
85ee1e7806
|
Merge pull request #3889 from luisramos0/tag_rules_transl
Fix missing translations in tag rules management page
|
2019-06-13 16:15:49 +01:00 |
|
Luis Ramos
|
bb7a2d7a5e
|
Merge pull request #3252 from mllocs/fix/navbar-right-items-styles
Top navbar redesign and cleanup
|
2019-06-13 12:04:20 +01:00 |
|
Matt-Yorkley
|
785595a951
|
Reduce initial queries on shop page by ~95%
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
874fb884b8
|
Refactor Angular controllers further
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
a91ae8947b
|
Only query visible enterprises
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
11e83af0b6
|
Remove duplication of enterprise angular controllers
We can re-use the enterprise and producers controllers here in their respective groups tabs, no need for a third controller
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
d5bd058754
|
Fix groups show page
It can definitely be cleaned up more in the future, but this should get us around a 90% reduction in page load times.
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
4ec46c2db6
|
Fix groups index page
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
1b8dfaf049
|
Fix HashNavigation reload bug
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
ed97400a23
|
Improve producers performance
|
2019-06-12 09:47:01 +01:00 |
|
Matt-Yorkley
|
45d65baf8e
|
Improve shops performance
|
2019-06-12 09:47:01 +01:00 |
|
luisramos0
|
6cf705ea55
|
In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id.
|
2019-06-11 21:28:52 +01:00 |
|
luisramos0
|
9944f3e1e6
|
Make translations of tooltips in subscriptions list page work again
|
2019-06-04 20:59:45 +01:00 |
|
luisramos0
|
cfcf73b6a1
|
Make save and saving messages translatable in subscriptions items panel
|
2019-06-04 20:59:45 +01:00 |
|
luisramos0
|
5024da4123
|
Make tag rules type descriptions in the management page translatable
|
2019-05-30 20:39:58 +01:00 |
|
luisramos0
|
6620243603
|
Make the submit button on the add tag rule dialog translatable
|
2019-05-30 20:22:02 +01:00 |
|
luisramos0
|
dc32d282a6
|
Fix some rubocop issues in menu css file
|
2019-05-24 23:54:00 +01:00 |
|
luisramos0
|
2654db7c82
|
Add new menu style as per design
|
2019-05-24 23:53:56 +01:00 |
|
luisramos0
|
ec9d50c824
|
Add new cart icon and extract cart joyride from cart haml file
|
2019-05-24 15:16:36 +01:00 |
|
Luis Ramos
|
db0c874622
|
Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views
[Spree Upgrade] Remove dependency to spree frontend - views and assets
|
2019-05-24 14:37:34 +01:00 |
|
Luis Ramos
|
4a321f200f
|
Merge pull request #3783 from kristinalim/fix/3782-missing_translation
3782 Fix missing translation in subscription update modal
|
2019-05-23 18:45:20 +01:00 |
|
luisramos0
|
15360971b0
|
Move signed_* files to views/shared/menu and add new logged in and profile icons
|
2019-05-23 15:58:02 +01:00 |
|
Luis Ramos
|
12282ad906
|
Merge pull request #3794 from m-budryte/replace_&_with_OR
& replaced by OR when multiple property filters are selected
|
2019-05-23 14:35:51 +01:00 |
|
luisramos0
|
d9438cb082
|
Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets
|
2019-05-21 12:39:29 +02: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 |
|
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 |
|
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 |
|
idanceinbetween
|
7790401d59
|
added buttons to form and updated sanitizer to allow extra formatting
|
2019-05-08 14:45:05 +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 |
|
Kristina Lim
|
c3d4288692
|
Fix translation for closed/closes in subscription update modal
|
2019-05-07 14:52:03 +08:00 |
|
Matt-Yorkley
|
6bdc5d4438
|
Fix maps performance
|
2019-05-07 00:36:08 +01:00 |
|
jazzdragon
|
37d15a1be3
|
Add classes to indicate collapsible is for medium screens or smaller
|
2019-05-04 20:12:12 -07:00 |
|
jazzdragon
|
623471290e
|
Make sure styling doesn't get messed up if resizing down and back up
|
2019-05-04 19:52:08 -07:00 |
|
jazzdragon
|
a876f81f0a
|
Make collapsible always visible on large screen
|
2019-05-04 19:48:30 -07:00 |
|
jazzdragon
|
271330d2fc
|
Add collapsible elements and styles
|
2019-05-04 19:43:46 -07:00 |
|
Eelco de Vlieger
|
4b2114c1e4
|
issue 3777 - Make all map icons green
|
2019-05-04 14:44:16 +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 |
|
luisramos0
|
d7e706e6e7
|
Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code
|
2019-04-29 13:40:52 +01:00 |
|
jazzdragon
|
7a27973ae3
|
Add translation and references in taTranslations (not working in alert)
|
2019-04-27 19:22:15 -07:00 |
|
jazzdragon
|
f6c0071554
|
Add reference comment
|
2019-04-27 17:01:07 -07:00 |
|
jazzdragon
|
35de9077da
|
Add config for taTranslations (no functional change)
|
2019-04-27 16:57:02 -07:00 |
|