Matt-Yorkley
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff07b97033
Add sidebar footer and buttons
...
Also includes a minor refactor to resolve an issue with animation timings. Angular was not adding the "shown" class to the different elements at the same time in the digest cycle, and it looked a bit shaky.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
da1d8e90e2
Update search placeholder
2020-05-10 09:44:11 +02:00
Matt-Yorkley
142cef3f3a
Add filters count
2020-05-10 09:44:11 +02:00
Matt-Yorkley
532e27b7e1
Move filters into new column on desktop
2020-05-10 09:37:56 +02:00
Pau Perez
ad70a63370
Update all locales with the latest Transifex translations
2020-05-08 12:01:42 +02:00
Pau Pérez Fabregat
2cf407ce35
Merge pull request #5349 from openfoodfoundation/transifex
...
Transifex
2020-05-08 10:20:07 +02:00
Luis Ramos
424932d61b
Merge pull request #5262 from luisramos0/closed_shop_msg
...
[Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)
2020-05-08 07:52:58 +01:00
Luis Ramos
468576ee8a
Merge pull request #5329 from romale/master
...
Correct translations
2020-05-07 16:04:24 +01:00
Luis Ramos
987347d5ab
Move translation keys to new correct location
2020-05-07 12:18:40 +01:00
Luis Ramos
3c7970f72f
Add select oc message when there are multiple OCs
2020-05-07 12:18:40 +01:00
Luis Ramos
21a1ba2fb5
Move translation keys according to new location in the customer_required partial
2020-05-07 12:17:43 +01:00
Luis Ramos
e0b3e9a040
Remove border of message and paddings, add background color, change link color and split message in two lines
2020-05-07 12:17:43 +01:00
Transifex-Openfoodnetwork
ffebaee9c7
Updating translations for config/locales/tr.yml
2020-05-07 17:34:22 +10:00
Transifex-Openfoodnetwork
6c71259b25
Updating translations for config/locales/en_FR.yml
2020-05-07 03:10:34 +10:00
Transifex-Openfoodnetwork
29a54cbfe4
Updating translations for config/locales/fr.yml
2020-05-07 03:10:22 +10:00
Transifex-Openfoodnetwork
05820c7ef0
Updating translations for config/locales/tr.yml
2020-05-07 00:14:33 +10:00
Transifex-Openfoodnetwork
492f96c90f
Updating translations for config/locales/tr.yml
2020-05-07 00:11:28 +10:00
Pau Pérez Fabregat
dadc17398f
Merge pull request #5371 from Matt-Yorkley/cart-add-error
...
Cart add error handling
2020-05-06 15:22:06 +02:00
Pau Pérez Fabregat
b3205c5459
Merge pull request #5309 from luisramos0/better-karma
...
Make dockerfile install node and adapt karma browser config to work inside a docker container
2020-05-06 11:11:00 +02:00
Transifex-Openfoodnetwork
d52db51b29
Updating translations for config/locales/nb.yml
2020-05-06 17:25:07 +10:00
Matt-Yorkley
13e4411b89
Add error message on cart populate failure and don't keep re-sending the data to the server.
...
This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.
2020-05-05 17:22:10 +02:00
Transifex-Openfoodnetwork
93881a742e
Updating translations for config/locales/en_GB.yml
2020-05-03 05:09:16 +10:00
Luis Ramos
b568d25446
Update all locales with the latest Transifex translations
2020-05-02 17:08:53 +01:00
Luis Ramos
303464a04e
Merge pull request #5297 from openfoodfoundation/transifex
...
Transifex
2020-05-02 15:40:54 +01:00
Luis Ramos
acb7e9751b
Move debug assets flag to another env var so we go back to having both profile and debug assets disabled by default
2020-05-02 10:42:49 +01:00
Transifex-Openfoodnetwork
39875308c2
Updating translations for config/locales/en_FR.yml
2020-05-01 04:55:35 +10:00
Transifex-Openfoodnetwork
c424e7b65e
Updating translations for config/locales/fr.yml
2020-05-01 04:55:21 +10:00
Luis Ramos
8845260979
Merge pull request #5285 from rmklaus12/5246-missing-translation-orders-list
...
5246 missing translation orders list
2020-04-30 14:00:26 +01:00
Pau Pérez Fabregat
4174ea69a1
Merge pull request #5247 from chrishil1/Placeholders_variant
...
Added placeholders in variant edit page
2020-04-30 12:05:59 +02:00
Pau Pérez Fabregat
676add18c3
Merge pull request #5322 from luisramos0/dead_content
...
Delete some dead views
2020-04-30 12:02:14 +02:00
Transifex-Openfoodnetwork
5bc5ef9a9d
Updating translations for config/locales/pt_BR.yml
2020-04-30 03:52:57 +10:00
romale
3a4ef2697c
Correct translations
...
Without it, some labels not translated to other language.
And, please check code:
en.admin.subscription.subscriptions - does not exists
but
en.admin.subscriptions.subscriptions - is exist
2020-04-29 18:27:09 +03:00
Luis Ramos
a38b18bd0d
Remove smtp config from admin config page
2020-04-29 13:34:19 +01:00
Luis Ramos
e6fa08edfc
Delete some dead views
2020-04-28 19:07:19 +01:00
Transifex-Openfoodnetwork
18fc4b7c92
Updating translations for config/locales/ca.yml
2020-04-29 01:13:42 +10:00
Transifex-Openfoodnetwork
612cc45ab7
Updating translations for config/locales/en_FR.yml
2020-04-29 01:13:35 +10:00
Transifex-Openfoodnetwork
16e289bf37
Updating translations for config/locales/en_GB.yml
2020-04-29 01:13:29 +10:00
Transifex-Openfoodnetwork
b54c6fcb26
Updating translations for config/locales/nb.yml
2020-04-29 01:13:26 +10:00
Transifex-Openfoodnetwork
8365c66add
Updating translations for config/locales/fil_PH.yml
2020-04-29 01:13:22 +10:00
Transifex-Openfoodnetwork
5590671c23
Updating translations for config/locales/fr.yml
2020-04-29 01:13:19 +10:00
Luis Ramos
9e43661127
Merge pull request #5153 from luisramos0/bye_bye_ga
...
Bye bye Google Analytics
2020-04-28 16:09:16 +01:00
Kristina Lim
265871932f
Merge pull request #5146 from coopdevs/dev-mode-profiling-settings
...
Add PROFILE var to set production-like settings
2020-04-28 20:31:13 +08:00
Luis Ramos
868929eed3
Merge pull request #4993 from luisramos0/move_ent_fees
...
Change engine routes to better work with specs in rails 4
2020-04-28 11:48:41 +01:00
Transifex-Openfoodnetwork
8e6d53f6c6
Updating translations for config/locales/nb.yml
2020-04-28 17:59:10 +10:00
Robin Klaus
f072e9d9c2
Add missing translations on order list page
2020-04-28 16:47:39 +10:00
Luis Ramos
6559b4d3a4
Make dockerfile install node and adapt karma browser config to work inside a docker container
2020-04-27 19:05:11 +01:00
