raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

1728 Commits

Author SHA1 Message Date
Maikel Linke
4cbc449a51 Remove unused parallel_tests gem 
Reverts db47c01784
 2018-10-09 16:54:08 +11:00
Maikel
68c58dcb68 Merge pull request #2770 from openfoodfoundation/transifex 
Transifex
 2018-10-09 15:18:17 +11:00
Matt-Yorkley
3e39f3e749 Disable logout on password change 2018-10-08 23:06:54 +01:00
Transifex-Openfoodnetwork
8b59943256 Updating translations for config/locales/de_DE.yml 2018-10-08 16:58:01 +11:00
Pau Pérez Fabregat
58a99a7f89 Merge pull request #2692 from Matt-Yorkley/bi/angular_orders 
Angularise orders page
 2018-10-04 21:10:48 +02:00
Aditya Sridhar
372ae8e4aa updated the spacing to be consistent. 2018-09-30 16:10:57 -04:00
Aditya Sridhar
06b28c1ab4 Better docs for Stripe.publishable_key and Stripe.endpoint_secret. 2018-09-30 15:50:33 -04:00
Maikel Linke
17d951f99d Rescue from any sign-up errors 
The most common failure would happen when sending the confirmation email
triggered by `user.save`. We rescue any errors here and give feedback to
the user.

This allows for immediate feedback when the user types an email address
that is not accepted by our mail server or the email setup is not
configured properly.
 2018-09-27 13:33:08 +10:00
luisramos0
921105301c Move angular-templates route and controller into Web engine 
The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine
This is done to keep it simple and remove the unnecessary dependency between main app and engine
If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
 2018-09-26 12:39:51 +01:00
luisramos0
b1c7e6c091 Fix assets precompilation by including web/all.js and web/all.css in the assets precompilation list in application.rb 2018-09-26 12:30:45 +01:00
Maikel
51f9a0afa1 Merge pull request #2562 from Matt-Yorkley/pi/product_attributes 
[Product Import] Product attributes
 2018-09-25 11:36:03 +10:00
Transifex-Openfoodnetwork
97775c0bc1 Updating translations for config/locales/fr_CA.yml 2018-09-25 06:12:48 +10:00
Matt-Yorkley
6f2760cf92 Move translations into their namespace and use '.key' format 2018-09-24 15:54:05 +01:00
Transifex-Openfoodnetwork
7175434910 Updating translations for config/locales/en_US.yml 2018-09-22 01:25:48 +10:00
Maikel Linke
5763bf0518 Update all translations 2018-09-20 10:33:02 +10:00
Matt-Yorkley
b57c6cf9ac Add errors when attempting to update non-updatable fields 2018-09-19 21:12:29 +01:00
Transifex-Openfoodnetwork
454cd8bfbf Updating translations for config/locales/nb.yml 2018-09-19 22:30:06 +10:00
Matt-Yorkley
68f0c80016 Add loading message and spinner 2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b Add pagination 2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a Convert orders index table to use angular ng-repeat 2018-09-19 09:33:25 +01:00
Transifex-Openfoodnetwork
f0d015be0d Updating translations for config/locales/de_DE.yml 2018-09-19 08:34:42 +10:00
Transifex-Openfoodnetwork
258347bc63 Updating translations for config/locales/fr.yml 2018-09-19 01:45:12 +10:00
Pau Pérez Fabregat
9f7d24934d Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters 
Translate "Any Enterprise" and "Any Schedule" in OC filters
 2018-09-18 11:42:19 +02:00
luisramos0
d170a4d489 New domain Web (rails engine) with the following features extracted from the main app: 
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
 2018-09-17 16:05:32 +01:00
Pau Pérez Fabregat
0f627cdf39 Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle 
Translate "COPY OF" when cloning an OC
 2018-09-17 12:38:29 +02:00
Pau Pérez Fabregat
0520f2187c Merge pull request #2540 from luisramos0/delete_dead_store 
removed assets related to spree store: dead code
 2018-09-17 11:33:56 +02:00
Kristina Lim
798a6ed391 Translate more text in OC filters 2018-09-17 10:09:17 +10:00
Maikel
ce7be68fac Merge pull request #2660 from kristinalim/translations-failed_oc_creation 
Translate and fix fallback errors when creating or updating OC
 2018-09-14 16:58:39 +10:00
Maikel
e836ac0234 Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link 
Enable setting a customized user guide link in general settings
 2018-09-14 15:46:05 +10:00
Maikel
beedd933e9 Merge pull request #2512 from kristinalim/feature-remove_enterprise_images 
Support removal of enterprise logo and promo image
 2018-09-14 15:07:24 +10:00
Maikel
eabb9f4574 Merge pull request #2659 from kristinalim/translations-admin_area_fixes 
Simple translation fixes for admin area and profile page
 2018-09-14 14:38:25 +10:00
Maikel
da2f278060 Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header 
Fix i18n translation for Store link in admin header for `fr`
 2018-09-14 14:24:29 +10:00
Maikel
514f64c8d0 Merge pull request #2650 from kristinalim/translations-more_admin_header 
Add "more" translation key
 2018-09-14 13:31:13 +10:00
Maikel
1000bd4d24 Merge pull request #2658 from kristinalim/translations-order_and_shipment_emails 
Allow fixing and customizing translations for order cancellation and shipment emails
 2018-09-14 10:11:56 +10:00
luisramos0
409f084bd4 Added matomo opt out iframe to cookies policy page 2018-09-12 18:30:24 +01:00
Pau Pérez Fabregat
3f5c799166 Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page 
Fix ask anonymous users to login for order page
 2018-09-12 16:17:34 +02:00
Hugo Daniel
cc43d789e2 Refacto edit method for content controller and enable custom user guide link 2018-09-12 14:51:53 +02:00
Pau Pérez Fabregat
e474271698 Merge pull request #2637 from Vadlusk/remove_css_splitter 
Remove duplicate css_splitter references, delete split css file.
 2018-09-12 13:07:15 +02:00
Maikel
5e0997d03e Merge pull request #2635 from apoc64/timezone_comments 
Adds comments for setting up timezone in application.yml
 2018-09-08 15:55:16 +10:00
Kristina Lim
003e65fbed Translate error when failing to create order cycle 2018-09-08 02:15:52 +08:00
Kristina Lim
2c2dd62f6a Translate "COPY OF" when cloning an OC 2018-09-08 02:06:52 +08:00
Kristina Lim
9dcdb67352 Translate inherits_properties label in product form 2018-09-08 01:37:57 +08:00
Kristina Lim
fc79aae17c Translate authorized shops headers in account page 2018-09-08 00:34:47 +08:00
Kristina Lim
c64acf47ab Fix translation key for "involving" in OC filters 2018-09-07 21:38:44 +08:00
Kristina Lim
86f4a118dd Translate placeholder for order cycle name filter 2018-09-07 17:58:34 +08:00
Kristina Lim
40443b19f1 Add translations for headers in enterprise index 
This is for the view when logged in as enterprise manager.

The translations added are:

* Producer?
* Package
* Status
 2018-09-07 17:51:08 +08:00
Kristina Lim
2cf608ffdf Add translations for shipment emails 2018-09-07 17:08:12 +08:00
Kristina Lim
f1d5088aaa Add translations for order cancellation emails 2018-09-07 17:01:43 +08:00
Maikel
62f5228f1f Merge pull request #2643 from luisramos0/transifex_manual 
Fetched latest translations from transifex with tx pull --force
 2018-09-07 16:46:24 +10:00
Kristina Lim
d06bccb832 Change i18n key for Store link in admin header 
spree_i18n translates the "store" key in different ways, sometimes like
"shop" and sometimes like "save". This could be because of a clash in
usage between Spree add-ons.

To be more specific, the "Store" link in the admin section now uses the
"admin.header.store" translation key.
 2018-09-06 22:03:39 +08:00