Transifex-Openfoodnetwork
d2b8b5e888
Updating translations for config/locales/pt_BR.yml
2020-05-18 05:14:19 +10:00
Transifex-Openfoodnetwork
4f14d7910a
Updating translations for config/locales/en_IE.yml
2020-05-15 23:04:12 +10:00
Transifex-Openfoodnetwork
78db7e0e5f
Updating translations for config/locales/en_GB.yml
2020-05-15 17:36:21 +10:00
Maikel Linke
51feef83ca
Update translations from Transifex
2020-05-15 14:10:36 +10:00
Maikel
90baec0e2c
Merge pull request #5393 from openfoodfoundation/transifex
...
Transifex
2020-05-15 13:53:56 +10:00
Transifex-Openfoodnetwork
bd8b3f11d1
Updating translations for config/locales/en_FR.yml
2020-05-14 05:42:38 +10:00
Transifex-Openfoodnetwork
937c981dd8
Updating translations for config/locales/fr.yml
2020-05-14 05:41:55 +10:00
Transifex-Openfoodnetwork
9b7de5ee6e
Updating translations for config/locales/en_NZ.yml
2020-05-13 19:27:55 +10:00
Luis Ramos
ef2d7f9485
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
...
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Luis Ramos
dcd097a22e
Merge pull request #5231 from pacodelaluna/add-dfc-provider-engine
...
Add DFC Provider engine
2020-05-11 20:27:21 +01:00
Matt-Yorkley
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7e6683581a
Remove full stop from translation
...
This doesn't fit with the new syntax structure
2020-05-10 09:44:12 +02:00
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
Transifex-Openfoodnetwork
644d06fb08
Updating translations for config/locales/en_FR.yml
2020-05-09 18:41:29 +10:00
Transifex-Openfoodnetwork
3044e62d8b
Updating translations for config/locales/fr.yml
2020-05-09 18:06:16 +10:00
Transifex-Openfoodnetwork
296a927900
Updating translations for config/locales/en_FR.yml
2020-05-08 22:49:17 +10:00
Transifex-Openfoodnetwork
32ead7b6b7
Updating translations for config/locales/fr.yml
2020-05-08 22:49:02 +10:00
Transifex-Openfoodnetwork
4485dcd7fe
Updating translations for config/locales/en_GB.yml
2020-05-08 20:57:56 +10: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
François Turbelin
013198b33b
Update routes
2020-05-06 22:04:56 +02:00
François Turbelin
d9d218f661
Add DFC Provider engine
2020-05-06 22:04:56 +02: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