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

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
7b06abd4c2 Fix initial password setting 2018-05-01 14:18:56 +10:00
Maikel Linke
de5124f90c Remove Heroku references since nobody is using it 2018-05-01 10:20:21 +10:00
Pau Perez
6784621c1b Remove invalid spree config 
According to
5ef8dc67df
"Backorders can be configured now as per stock location or stock item".
 2018-04-30 13:53:23 +02:00
Pau Perez
c3132e87d6 Rename and fix simple_product to base_product 
This factory has been merged into the base_product factory. Besides,
products no longer have on_hand attribute.
 2018-04-30 13:49:52 +02:00
Pau Pérez Fabregat
e7b1d933f4 Merge pull request #2253 from coopdevs/apply-spree-2.0-migrations 
Apply spree 2.0 migrations
 2018-04-30 12:51:29 +02:00
Pau Perez
19870eccdc Install and run Spree v2.0.4 migrations 2018-04-27 17:02:28 +02:00
Pau Pérez Fabregat
9840f3bb6b Merge pull request #2252 from coopdevs/use-patched-spree-2.0.4 
Use OFN's Spree fork of 2.0.4 to get fixes
 2018-04-27 16:58:33 +02:00
Pau Pérez Fabregat
d238aedb21 Merge pull request #2224 from coopdevs/minor-upgrade-rails 
Upgrade Rails to 3.2.22.5 to get security fixes
 2018-04-27 12:46:26 +02:00
Matt-Yorkley
a08b095547 Extract json render from :user_confirmed? method 2018-04-27 12:37:42 +10:00
Matt-Yorkley
1c57f0f241 Update :return_url value when re-sending email confirmations 2018-04-27 12:37:42 +10:00
Matt-Yorkley
1f23402912 Disable password reset for unconfirmed users 2018-04-27 12:37:42 +10:00
Matt-Yorkley
1782a8c700 manager invite permissions spec 2018-04-27 10:13:54 +10:00
Matt-Yorkley
b431a7417a Add cancan permissions for Admin::ManagerInvitationsController 2018-04-27 10:13:54 +10:00
Pau Perez
97e8adf7a7 Use OFN's Spree fork of 2.0.4 to get fixes 
We encountered the bug that
3fd1535e75
fixes, which is needed to boot the app using Spree 2.0.4.

This stems from
https://github.com/openfoodfoundation/openfoodnetwork/issues/2236#issuecomment-384633612
 2018-04-26 16:35:28 +02:00
Enrico Stano
6ae1780180 Merge pull request #2248 from coopdevs/upgrade-rubyzip 
Update rubyzip to fix security issue
 2018-04-26 14:50:10 +02:00
Pau Pérez Fabregat
1abf56efd5 Merge pull request #2246 from coopdevs/autofix-comment-indentation 
Autofix comment indentation
 2018-04-25 15:39:34 +02:00
Pau Perez
c12ac91371 Update rubyzip to fix security issue 
Github reported us about CVE-2017-5946 which is a high severity issue.

This gem is used by Roo which already supports the Rubyzip version that
contains the fix (version 1.2.1). Check
872bb3a0b6
for further details.

Rubyzip's changelog for the version 1.2.1 can be found in
https://github.com/rubyzip/rubyzip/blob/master/Changelog.md#121.
 2018-04-24 16:08:34 +02:00
Pau Perez
25ad9b22aa Update .rubocop_todo.yml 2018-04-23 13:03:05 +02:00
Pau Perez
11081ab1d6 Autocorrect Rubocop's Layout/CommentIndentation cop 2018-04-23 12:51:09 +02:00
Pau Pérez Fabregat
a1645477e0 Merge pull request #2235 from coopdevs/upgrade-to-spree-2.0.4 
Upgrade Spree to 2.0.4 instead of 2.0.13
 2018-04-23 12:14:49 +02:00
Maikel Linke
3fc49d5935 Simplify code 2018-04-23 12:55:49 +10:00
Matt-Yorkley
cd4268d219 Add manager dropdown UX 2018-04-23 12:55:49 +10:00
Rob Harrington
c77a01815c Copy datepicker directive to utils module 
Ensures that datepicker is available for subscriptions
 2018-04-23 11:05:22 +10:00
Pau Pérez Fabregat
386716088a Merge pull request #2190 from Matt-Yorkley/uk/bep_images_modal 
Use angular translation filter on image upload modal
 2018-04-20 16:22:53 +02:00
Pau Pérez Fabregat
9a75728b6e Merge pull request #2231 from coopdevs/add-image-for-wiki 
Add image to be used in Spree upgrade wiki page
 2018-04-20 09:26:17 +02:00
Pau Perez
58f3b5a97e Upgrade Spree to 2.0.4 instead of 2.0.13 
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.

Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-

A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
 2018-04-18 08:56:03 +02:00
Pau Perez
ef3ef2d4f3 Upgrade Rails to 3.2.22.5 to get security fixes 
This will fix reported vulnerabilities CVE-2015-7576, CVE-2016-2098
(reported as high severity), CVE-2016-0751 and CVE-2015-7577.
 2018-04-17 20:56:51 +02:00
Pau Perez
cd9d13cb2a Add images to be used in Spree upgrade wiki page 2018-04-17 20:55:42 +02:00
Pau Pérez Fabregat
89bc9380eb Merge pull request #2232 from coopdevs/skip-feature-spec-until-fixed 
Disable totally unreliable feature test
 2018-04-17 20:54:20 +02:00
Pau Perez
9f06d1f809 Disable totally unreliable feature 
We need to investigate why it fails so many times fix it and then enable it
back. As it is, it brings cons than pros preventing even PRs that don't
touch code from being merged.
 2018-04-17 19:22:03 +02:00
Pau Pérez Fabregat
ac37b0fc7e Merge pull request #2221 from Matt-Yorkley/uk/bep_images_ux 
Close modal when image updated successfully
 2018-04-17 18:05:20 +02:00
Pau Perez
06ef2a4c63 Remove commented out gem from Gemfile 2018-04-17 16:10:41 +02:00
Hugo Daniel
595a622d5b Removing useless spaces 2018-04-17 16:10:41 +02:00
Hugo Daniel
d9f451b6fe Removing redundant curly braces 2018-04-17 16:10:41 +02:00
Hugo Daniel
abe5d3596c Refactor Order#current_order argument 2018-04-17 16:10:41 +02:00
Hugo Daniel
e6b58c6db4 Remove ssl deprecated configuration 2018-04-17 16:10:40 +02:00
Hugo Daniel
6f3663f1b9 update gemfile to spree 2.0.13 2018-04-17 16:10:40 +02:00
Pau Pérez Fabregat
1abfe2ab8c Merge pull request #2199 from coopdevs/auto-correct-cops 
Auto correct cops
v1.14 		2018-04-16 14:58:28 +02:00
Pau Pérez Fabregat
b1fc15f242 Merge pull request #2223 from openfoodfoundation/transifex 
Transifex
 2018-04-16 13:43:40 +02:00
Pau Pérez Fabregat
fc7dd5d081 Merge pull request #2222 from coopdevs/upgrade-skylight 
Upgrade to latest Skylight from 1.6.0 to 1.6.1
 2018-04-16 11:38:23 +02:00
Pau Perez
2aea612f10 Upgrade to latest Skylight from 1.6.0 to 1.6.1 2018-04-16 10:52:15 +02:00
Pau Perez
147a74f005 Fix Rubocop violations reported by Code Climate 2018-04-16 10:27:44 +02:00
Rob Harrington
6a71aafce1 Update totals for empty order before sending email 2018-04-16 17:07:07 +10:00
Rob Harrington
f5e77cdcec Ensure order total for uplaced subscription orders is zero 2018-04-16 17:07:07 +10:00
Rob Harrington
50ffd7ca01 Clear adjustments on subs orders when no items are able to be fulfilled 
This prevents shipping and payment fees from being displayed in the notification email
 2018-04-16 17:07:07 +10:00
Matt-Yorkley
37ba1e6c83 Close modal when image updated successfully 2018-04-15 20:52:25 +01:00
Matt-Yorkley
5777d04821 Use angular translation filter on image upload modal 2018-04-15 17:08:16 +01:00
Pau Pérez Fabregat
514ad5d898 Merge pull request #2208 from coopdevs/performance-monitoring-badge 
Add Skylight's performance monitoring badge
 2018-04-13 08:45:30 +02:00
Pau Perez
5822e60a66 Add Skylight's performance monitoring badge 
Adding the badge, which points now to Katuma's performance monitoring
information, is required for Skylight to showcase OFN on their website.
 2018-04-12 09:29:40 +02:00
Transifex-Openfoodnetwork
ce2a7a510f Updating translations for config/locales/en_US.yml 2018-04-11 00:06:55 +10:00