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

9693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
33f6dc21e7 Merge pull request #2516 from kristinalim/cleanup-move_admin_and_spree_from_routes 
Separate admin and Spree routes from main file
 2018-08-09 10:10:49 +10:00
Maikel
f93ed0de85 Merge pull request #2519 from mkllnk/more-efficient-login-in-specs 
More efficient login in specs
 2018-08-09 10:05:54 +10:00
Maikel
03468efa7e Merge pull request #2346 from oeoeaio/subs-totals 
Subs: totals in backend are consistent and include fee breakdown
 2018-08-07 18:17:13 +10:00
Maikel Linke
9aff9fbce2 Remove empty spec 2018-08-07 16:01:38 +10:00
Maikel Linke
b628ead525 Speed up shipping methods spec 2018-08-07 16:01:38 +10:00
Maikel Linke
54552f2be7 Speed up admin schedules spec 2018-08-07 16:01:37 +10:00
Maikel Linke
819a173167 Speed up reports spec 2018-08-07 16:01:37 +10:00
Maikel Linke
aa677a117b Speed up admin products spec 2018-08-07 16:01:37 +10:00
Maikel Linke
eb550505ae Speed up admin payment method spec 2018-08-07 16:01:37 +10:00
Maikel Linke
9023b16395 Speed up admin orders spec 
From 80s to 74s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
71a381e48e Speed up order cycles spec 
From 68 to 63 seconds.
 2018-08-07 16:01:37 +10:00
Maikel Linke
f4cd5a7e4b Speed up admin enterprise spec 
From 40s to 36s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
121bc51feb Speed up admin enterprises spec 
From 6.5s to 5.3s.
 2018-08-07 16:01:37 +10:00
Maikel Linke
f0da823445 Speed up enterprise user spec 
From 1.9s to 1.7s.
 2018-08-07 12:41:07 +10:00
Maikel Linke
e4ebeb8a29 Remove dead spec code 
The code has been inactive since 2015 and was probably obsolete anyway.
 2018-08-07 12:37:49 +10:00
Maikel Linke
0b39054954 Speed up relationships spec 
From 18s to 12s: 33% speed up
 2018-08-07 12:33:26 +10:00
Maikel Linke
126f312c6b Make spec more robust not relying on order 
Enterprises can be in different order. Using `with_options` doesn't
care about the order.
 2018-08-07 12:30:59 +10:00
Maikel Linke
edb32218b0 Use quick login to speed up product edit spec 
From 48s to 44s: 8% speed up
 2018-08-07 12:11:15 +10:00
Maikel Linke
0edf393c12 Use quick login to speed up spec 
We don't need to visit the admin dashboard before each spec.
On my machine:

  54 seconds before
  47 seconds after
  speed up by 13%
 2018-08-07 10:56:42 +10:00
Maikel Linke
30fad228c5 Remove code duplication in spec helper 2018-08-07 09:24:31 +10:00
Maikel
32846af230 Merge pull request #2517 from kristinalim/cleanup-disable_rubocop_cop_rails_activerecordaliases 
Disable rubocop cop "Rails/ActiveRecordAliases"
 2018-08-07 09:11:00 +10:00
Kristina Lim
d77a94335b Update .rubocop_todo.yml 2018-08-06 18:45:52 +08:00
Kristina Lim
a494fb274e Disable rubocop cop Rails/ActiveRecordAliases 
The methods :update! and :update (to replace :update_attributes! and
:update_attributes) were not added until Rails 4.

See this for more information:
https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Rails/ActiveRecordAliases
 2018-08-06 18:12:43 +08:00
Kristina Lim
b67c8cc9f1 Improve requiring of additional routes 
This is more appropriate, and allows changes the separate route files to
be loaded automatically in the development environment.
 2018-08-06 17:04:03 +08:00
Kristina Lim
4d34693c05 Move Spree route customizations from main file 2018-08-06 09:57:29 +08:00
Kristina Lim
72036a4993 Move admin routes from main file 2018-08-06 09:57:24 +08:00
Maikel Linke
f0be8ff290 Style proxy order serializer 2018-08-03 15:07:22 +10:00
Maikel Linke
b736560d63 Inform about inaccurate subscription totals 
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
 2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow v1.18.0 2018-08-03 14:33:35 +10:00
Maikel Linke
d5fdda1c46 Fix typo translating Enterprises 2018-08-03 12:15:50 +10:00
Maikel Linke
c48889f368 Remove duplicate translation key 2018-08-03 12:15:50 +10:00
Rob Harrington
cead905d05 Use estimated subscription total for proxy orders if order has not been initialized 2018-08-03 12:14:25 +10:00
Rob Harrington
fb93351386 Show fee breakdown in line items panel if present 2018-08-03 12:14:25 +10:00
Maikel
d726b0a851 Merge pull request #2509 from coopdevs/update-spree-fork-version 
Update Spree's fork revision in Gemfile
 2018-07-31 09:26:00 +10:00
Pau Perez
c4b23b62d0 Update Spree's fork revision in Gemfile 2018-07-30 18:11:02 +10:00
Maikel
915531acc4 Add section about documentation updates 
This should prevent issues like https://github.com/openfoodfoundation/openfoodnetwork/issues/2427.

Also converted comments into HTML syntax so that you don't have to delete them when creating a PR.
 2018-07-30 14:44:07 +10:00
Maikel
8ecc786b99 Include bug severity in issue template 
And formatted for easier reading and writing.
 2018-07-30 14:28:01 +10:00
Rob H
7f26b1494b Fix syntax error in GETTING_STARTED.md 2018-07-27 12:49:18 +10:00
Rob H
eb89b74022 Fix syntax error in README.md 2018-07-27 12:48:37 +10:00
Maikel
933ff63de2 Merge pull request #2389 from luisramos0/bulk_prod_edit_fix 
admin page fetcher is now synchronously fetching all pages before reso…
 2018-07-26 14:09:21 +10:00
Maikel
3f91850301 Merge pull request #2499 from mkllnk/update-com-links-in-readme 
Add communications links to README
 2018-07-26 11:39:29 +10:00
Rob Harrington
a16058f52a Fix link syntax errors in REAME.md and GETTING_STARTED.md 2018-07-26 11:38:39 +10:00
Maikel
02331221ef Merge pull request #2471 from Matt-Yorkley/pi/post_save 
PI: post-save UI changes
 2018-07-26 11:26:51 +10:00
Maikel Linke
2ceb969925 Style recently merged code 
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
 2018-07-26 10:52:56 +10:00
Maikel Linke
f0f9662957 Update gem i18n-js to pick up locale changes 
We had some problems recently with changes in en.yml not being picked up
by i18n-js to be included in all.js. There have been some patches for
the current version that have an impact on that:

578555f57e
db3cdf82aa
a88b206644

Trying it out locally, the updated i18n-js gem works while the old
version doesn't update the Javascript translations when new keys are
added. To reproduce the issue, you can add a new key in `en.yml` and
reference it from an Angular template in `app/assets/javascripts/`. The
old version complained about a missing translation until you ran:
```
bundle exec rake tmp:cache:clear
```

We don't need to do that any more.
 2018-07-26 10:45:35 +10:00
Pau Pérez Fabregat
97e61dc6f9 Merge pull request #2498 from Matt-Yorkley/embedded_mobile 
Fix embedded shopfront menu responsiveness
 2018-07-25 15:10:46 +02:00
Matt-Yorkley
ae5fd864d1 Fix embedded shopfront menu responsiveness 2018-07-25 17:41:26 +10:00
Maikel Linke
5db5bc65c0 Add communications links to README 
This was originally proposed by Kirsten in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/2478
 2018-07-24 11:18:54 +10:00
Maikel
ffd3d28889 Merge pull request #2474 from Matt-Yorkley/pi/import_options 
PI: import options UI
 2018-07-24 10:34:14 +10:00
Maikel
30be40ebd9 Merge pull request #2441 from kristinalim/fix-scoping_issue_in_sorting_of_tables 
Fix front-end sorting in "Customers" index and "Bulk Order Management" page
 2018-07-24 10:31:13 +10:00