raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 20 Branches 451 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
bf8a31abda Add rake task to report lost payments 
In rare cases, payment records can get lost through database rollbacks.
This new rake task tries to find log entries for lost transactions and
reports them as CSV.
 2019-06-14 11:10:31 +10:00
Transifex-Openfoodnetwork
f0977f3c39 Updating translations for config/locales/nb.yml 2019-06-14 08:08:37 +10:00
dependabot-preview[bot]
16ad94f3a8 Bump activerecord-import from 1.0.1 to 1.0.2 
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.1...v1.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-13 19:23:40 +00:00
luisramos0
6223a738a7 Fix rubocop issues in collapsible.css 2019-06-13 19:32:33 +01:00
luisramos0
a370216f54 Change default translation in the registration introduction so that it looks better when collapsed 2019-06-13 19:28:31 +01:00
luisramos0
473fb45132 Remove an extra break line to remove html space and make sure alignment is correct 2019-06-13 19:28:10 +01:00
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
Rachel Arnould
d3cb106ae4 Update README.md 
In order to benefit from a free unlimited account at Browser stack, they asked us to 
*Give us a shoutout on your GitHub project page. Post an hyperlink and a line about how you use BrowserStack.*
 2019-06-13 18:58:58 +02:00
Luis Ramos
ddfd14ebb3 Merge pull request #3905 from openfoodfoundation/dependabot/bundler/i18n-js-3.3.0 
Bump i18n-js from 3.2.2 to 3.3.0
 2019-06-13 17:33:50 +01:00
luisramos0
1db220e1e0 Remove unnecessary referer setting from products controller spec 2019-06-13 17:22:09 +01:00
Luis Ramos
29bc961e8a Merge pull request #3890 from luisramos0/transl_prod_page 
Add missing translation keys to the create product page
 2019-06-13 17:13:40 +01:00
Transifex-Openfoodnetwork
216e181c6e Updating translations for config/locales/en_GB.yml 2019-06-14 01:53:18 +10:00
Transifex-Openfoodnetwork
b65b94b6f9 Updating translations for config/locales/en_GB.yml 2019-06-14 01:50:11 +10: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
7d24bcf868 Merge pull request #3798 from m-budryte/order_cycles_add_fee_remove_link 
the translations for Remove in the exchange forms added
 2019-06-13 16:15:28 +01:00
Luis Ramos
1df1ba9403 Merge pull request #3888 from luisramos0/translations 
Add translation keys to actions in the order payments list page
 2019-06-13 15:36:43 +01:00
Luis Ramos
e15ccdbd74 Merge pull request #3840 from mkllnk/3727-default-credit-cards 
Make only reusable credit cards the default card
 2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630 Merge pull request #3886 from luisramos0/fees_translations 
Make a few more things translatable in the Enterprise Fees management page
 2019-06-13 14:12:16 +01:00
Luis Ramos
09a5426095 Merge pull request #3880 from kristinalim/fix/3792-optimize_order_cycle_variant_updates 
3792 Optimize saving Order Cycle changes
 2019-06-13 12:33:22 +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
Pau Pérez Fabregat
080689ccfa Merge pull request #3917 from luisramos0/subs_visible 
Make subs radio button visible to all managers
 2019-06-12 16:42:31 +02:00
Matt-Yorkley
41a36bb704 Update all locales with the latest Transifex translations v2.1.0 2019-06-12 13:54:41 +01:00
Luis Ramos
7cae7ca520 Merge pull request #3897 from openfoodfoundation/dependabot/bundler/fuubar-2.4.0 
Bump fuubar from 2.3.2 to 2.4.0
 2019-06-12 13:29:04 +01:00
Luis Ramos
05856c44dd Merge pull request #3906 from openfoodfoundation/dependabot/bundler/webmock-3.6.0 
Bump webmock from 3.5.1 to 3.6.0
 2019-06-12 13:28:36 +01:00
Luis Ramos
b02bf3b83c Merge pull request #3872 from luisramos0/rails4_where_scope 
[Rails 4] Change all model scopes without a callable object to use a proc
 2019-06-12 12:53:10 +01:00
Matt-Yorkley
48ebfbee90 Merge pull request #3902 from openfoodfoundation/transifex 
Transifex
 2019-06-12 10:02:40 +01:00
Matt-Yorkley
785595a951 Reduce initial queries on shop page by ~95% 2019-06-12 09:47:01 +01:00
Matt-Yorkley
0aa8b1a30e Make shop hidden ams injection consistent with other uses 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
9703d848ef Improve syntax in injection_helper 2019-06-12 09:47:01 +01:00
Matt-Yorkley
4155b17633 Remove tests that reference removed code 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
aca1f92060 Adapt specs to new loading methods 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
ae8f1a92e8 Remove "profiles" from /shops 2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6 List only current taxons for active enterprises 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
Matt-Yorkley
e329b4bfb0 Improve queries for serializers 2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat
99b82272cc Merge pull request #3883 from Matt-Yorkley/order_cycles_performance 
Admin order cycles performance
 2019-06-12 10:38:54 +02:00
Pau Pérez Fabregat
fd95ae7e41 Merge pull request #3847 from Matt-Yorkley/api_access 
Allow unauthenticated access to OFN API endpoints
 2019-06-12 09:45:11 +02:00
Maikel Linke
76d77ceb51 Update and generalise database mirror script 
The old script was specfic to the use in Australia and out of date. The
new version isn't perfect but works well for me.
 2019-06-12 10:19:56 +10:00
luisramos0
f23094df09 Fix file name of js unit test files in admin/order_cycles/controllers 2019-06-11 21:28:55 +01:00
luisramos0
9c539da811 Fix rubocop issue in schedules_controller.collection by extracting method 2019-06-11 21:28:55 +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
Maikel Linke
d1901cbea4 Allow class_eval to have more than 25 lines 2019-06-11 18:01:41 +01:00