raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Pau Perez
394fb91dd5 Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop 2018-04-09 18:47:18 +02:00
Pau Perez
1640d5ad0b Auto correct Rubocop's Layout/IndentHeredoc cop 2018-04-09 18:47:18 +02:00
Pau Perez
76fe1c7ee9 Auto correct Rubocop's Layout/IndentAssignment cop 2018-04-09 18:47:18 +02:00
Pau Perez
33ea2c0b07 Auto correct Rubocop's Layout/FirstParameterIndentation cop 2018-04-09 18:47:18 +02:00
Pau Perez
f5a5d735fd Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop 2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6 Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop 2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801 Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop 2018-04-09 18:47:17 +02:00
Pau Perez
746fcd5802 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop 2018-04-09 18:47:17 +02:00
Pau Perez
9da33b4e82 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop 
This also `script/rubocop_autocorrect` to automate the process of fixing
a cop and comitting the changes.
 2018-04-09 18:46:11 +02:00
Pau Perez
e876ef7df1 Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop 2018-04-09 17:22:52 +02:00
Pau Perez
e4c86df7b2 Auto correct Rubocop's Layout/CaseIndentation cop 2018-04-09 17:19:47 +02:00
Transifex-Openfoodnetwork
15945fa1e0 Updating translations for config/locales/fr.yml 2018-04-05 04:48:54 +10:00
Transifex-Openfoodnetwork
ad898848f8 Updating translations for config/locales/pt.yml 2018-04-05 04:29:49 +10:00
Rob Harrington
236ba9328d Order cycles in specs comply with new date validations 2018-04-04 17:18:33 +10:00
Rob Harrington
ce56e667a4 Use union operator instead of concatenate to load order cycle collection 2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3 Add validation of open and close dates for order cycles 2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956 Return an error if no order_cycle_set params are submitted to #bulk_update action 2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d Refactor loading of OrderCycleSet in OrderCyclesController 
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
 2018-04-04 17:17:36 +10:00
stveep
46d2d6cb8a Include option text in dropdown cart even if the variant and product have the same name 2018-04-04 16:40:18 +10:00
Maikel Linke
a2e4c33922 Remove old and useless sentence from welcome email 
The sentence made assumptions of the availability of FAQs and support
forums without linking to them. So it didn't really help. It also
promised that someone would monitor the support page in the forum which
nobody seems to do.
 2018-04-04 16:21:39 +10:00
Matt-Yorkley
101269a487 Adjust wording on manager invite email 2018-04-04 15:49:04 +10:00