raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-15 04:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,978 Commits 16 Branches 457 Tags
d1331ac78a17f2a05efd42c01ac24d279ea7cb95
Commit Graph

3724 Commits

Author SHA1 Message Date
andresgutgon
d1331ac78a Fix datetime picker translations on Order cycles screen 
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
 2020-09-06 13:43:35 +02:00
Luis Ramos
4fe24da3ec Merge pull request #5748 from mbudm/issue/5072 
Add redirect to shop on order cycle change
 2020-09-04 10:03:07 +01:00
Maikel
819a445547 Merge pull request #5712 from mbudm/issue/5208 
Add payment details to invoice
 2020-08-28 09:46:49 +10:00
Pau Pérez Fabregat
2fa8cd54fd Merge pull request #5769 from Matt-Yorkley/customer-names 
Customer names in reports
 2020-08-27 15:39:47 +02:00
Steve Roberts
ef0038a661 Change trigger to update filters after ProductsCtrl is loaded. 2020-08-27 18:02:01 +10:00
Steve Roberts
4e635e114c Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072 2020-08-27 14:48:51 +10:00
Maikel
7ce9a3f988 Merge pull request #5894 from julesemmac/places-error 
adding required argument to resolve Places error
 2020-08-27 11:01:19 +10:00
Luis Ramos
19b5a004dd Merge pull request #5877 from Matt-Yorkley/bugsnagger 
BugsnagJS checkout errors
 2020-08-21 14:01:48 +01:00
Steve Roberts
c79f2326fc Fix some more issues raised by semaphore 2020-08-20 17:16:20 +01:00
Steve Roberts
ac69bef459 Fix issues raised by linter 2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361 Modify payment_list partial to be shared 
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
 2020-08-20 17:16:20 +01:00
Steve Roberts
1f470830c8 add vars to email.scss 2020-08-20 17:16:20 +01:00
Steve Roberts
a00e964eb6 Clean up scss - picked up by codeclimate 2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97 Add more details on payments to invoice. 2020-08-20 17:16:20 +01:00
Matt-Yorkley
ed346b3b54 Add scrolling animate on sidebar hide 2020-08-17 13:41:06 +01:00
Matt-Yorkley
5f8fc64b31 Move layout adjustment from view to CSS 2020-08-15 12:18:41 +01:00
Matt-Yorkley
ce5bcaaa20 Explicitly notify Bugsnag on checkout failure 2020-08-14 18:06:30 +01:00
julesemmac
dee34d1f26 adding required argument to resolve Places error 2020-08-10 23:19:21 -04:00
Luis Ramos
f14bb280c1 Merge pull request #5680 from cillian/prevent-blank-open-street-map 
If no enterprises have been geocoded yet make sure Open Street Map displays correctly
 2020-08-05 20:27:40 +01:00
Cillian O'Ruanaidh
e6ab2ae753 Remove unused positiveAngles and negativeAngles arrays from map centre calculator service. 
I forgot to remove these when I was refactoring this earlier.
 2020-08-03 15:12:40 +01:00
Luis Ramos
1e9b11d209 Merge pull request #5807 from romale/patch-5 
Add Russian to list of momentJS locales
 2020-07-30 19:01:38 +01:00
Luis Ramos
fbc7eea1a5 Merge pull request #5811 from jttyeung/master 
Fix #5730 content header overlap with long product names
 2020-07-30 17:53:09 +01:00
Pau Perez
84178c637e Add missing momentjs languages to back-office 2020-07-29 13:02:46 +02:00
Pau Perez
9bf58a8258 Add missing Catalan, Arabic & Turkish for momentjs 2020-07-29 12:53:34 +02:00
Cillian O'Ruanaidh
702669e61c Merge branch 'master' into prevent-blank-open-street-map 2020-07-24 16:00:37 +01:00
Cillian O'Ruanaidh
cc317bc8c9 Move the :initialLatitude and :initialLongitude methods from the OpenStreetMap service to the MapCenterCalculator service. 2020-07-24 16:00:30 +01:00
Luis Ramos
32d45f6fe5 Merge pull request #5747 from mbudm/issue/5434 
Make keyboard UI close on iOS when done searching
 2020-07-24 13:25:39 +01:00
Joanne Yeung
abc132d3db Remove trailing whitespace 2020-07-23 09:37:10 -06:00
Joanne Yeung
b16f486dcc Address missing semi-colon 2020-07-23 09:25:56 -06:00
Joanne Yeung
6419036a26 Fix content header overlap with long product names 2020-07-22 15:53:44 -06:00
romale
daa3f00302 Update all.js.coffee 2020-07-22 20:30:21 +03:00
romale
77c920daab Update all.js 2020-07-22 20:29:15 +03:00
Steve Roberts
429c88c000 Add watcher to update filter after products are loaded 
Also remove the other redundant trigger
 2020-07-16 12:06:26 +10:00
Steve Roberts
79abc191ff Move location change to PageSelection controller 2020-07-15 15:51:33 +10:00
Steve Roberts
dbc7632c4e Add inline comment to explain two height properties 2020-07-15 09:52:04 +10:00
Steve Roberts
c4d7899a99 Use vh units for new browsers and align tagline bg to top. 2020-07-14 19:26:12 +10:00
Steve Roberts
3a722bc697 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/5072 2020-07-14 13:31:53 +10:00
Steve Roberts
60870a1215 Fix linting errors 2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253 2020-07-14 12:45:14 +10:00
Luis Ramos
cc3361aaac Merge pull request #5659 from dmarcoux/issue-5555 
Filter orders on inclusive dates in admin/orders
 2020-07-09 20:40:45 +01:00
Steve Roberts
2f562809c0 Ensure the hero image doesn't attempt to use the full height of all page content 
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
 2020-07-08 21:31:52 +10:00
Steve Roberts
7e195c3856 Add redirect to shop on order cycle change 2020-07-08 20:18:21 +10:00
Steve Roberts
eda9293619 Change to new directive that prevents enter default and blurs the input field 2020-07-08 19:19:46 +10:00
Dany Marcoux
3dfabdc117 Filter orders on inclusive dates in admin/orders 
Closes #5555

Co-authored-by: Luis Ramos <luisramos0@gmail.com>
 2020-07-05 20:12:16 +02:00
Luis Ramos
a472b6525f Merge pull request #5707 from luisramos0/missing_spaces 
Add space after translations so that translators dont have to guess a space is needed
 2020-07-03 16:10:55 +01:00
Luis Ramos
658c77f3f5 Merge pull request #5701 from Matt-Yorkley/noimage 
Noimage
 2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline 
Manage OFN's font through the asset pipeline
 2020-07-02 20:09:08 +01:00
Pau Pérez Fabregat
66ddde1808 Merge pull request #5682 from Matt-Yorkley/in-digest-ion 
Move default versions of Paperclip-managed images to /public
 2020-07-01 18:02:15 +02:00
Luis Ramos
63934b7863 Add space after translation so that translators dont have to guess a space is needed after the translation 2020-07-01 11:56:37 +01:00
Pau Perez
0c93de8298 Manage OFN's font through the asset pipeline 2020-06-30 09:02:36 +02:00