Commit Graph

  • c597b3c377 Speed-up spec Maikel Linke 2018-05-01 14:40:05 +10:00
  • 7b06abd4c2 Fix initial password setting Maikel Linke 2018-05-01 14:18:56 +10:00
  • de5124f90c Remove Heroku references since nobody is using it Maikel Linke 2018-05-01 10:20:21 +10:00
  • 6784621c1b Remove invalid spree config Pau Perez 2018-04-30 13:53:23 +02:00
  • c3132e87d6 Rename and fix simple_product to base_product Pau Perez 2018-04-30 13:49:52 +02:00
  • e7b1d933f4 Merge pull request #2253 from coopdevs/apply-spree-2.0-migrations Pau Pérez Fabregat 2018-04-30 12:51:29 +02:00
  • 19870eccdc Install and run Spree v2.0.4 migrations Pau Perez 2018-04-26 16:59:34 +02:00
  • 9840f3bb6b Merge pull request #2252 from coopdevs/use-patched-spree-2.0.4 Pau Pérez Fabregat 2018-04-27 16:58:33 +02:00
  • d238aedb21 Merge pull request #2224 from coopdevs/minor-upgrade-rails Pau Pérez Fabregat 2018-04-27 12:46:26 +02:00
  • a08b095547 Extract json render from :user_confirmed? method Matt-Yorkley 2018-04-21 13:37:48 +01:00
  • 1c57f0f241 Update :return_url value when re-sending email confirmations Matt-Yorkley 2018-04-18 16:26:39 +01:00
  • 1f23402912 Disable password reset for unconfirmed users Matt-Yorkley 2018-04-18 15:14:21 +01:00
  • 1782a8c700 manager invite permissions spec Matt-Yorkley 2018-04-19 17:16:37 +01:00
  • b431a7417a Add cancan permissions for Admin::ManagerInvitationsController Matt-Yorkley 2018-04-14 19:33:33 +01:00
  • 97e8adf7a7 Use OFN's Spree fork of 2.0.4 to get fixes Pau Perez 2018-04-26 16:26:00 +02:00
  • 6ae1780180 Merge pull request #2248 from coopdevs/upgrade-rubyzip Enrico Stano 2018-04-26 14:50:10 +02:00
  • 1abf56efd5 Merge pull request #2246 from coopdevs/autofix-comment-indentation Pau Pérez Fabregat 2018-04-25 15:39:34 +02:00
  • c12ac91371 Update rubyzip to fix security issue Pau Perez 2018-04-24 16:08:34 +02:00
  • 25ad9b22aa Update .rubocop_todo.yml Pau Perez 2018-04-23 13:03:05 +02:00
  • 11081ab1d6 Autocorrect Rubocop's Layout/CommentIndentation cop Pau Perez 2018-04-23 12:51:09 +02:00
  • a1645477e0 Merge pull request #2235 from coopdevs/upgrade-to-spree-2.0.4 Pau Pérez Fabregat 2018-04-23 12:14:49 +02:00
  • 3fc49d5935 Simplify code Maikel Linke 2018-04-23 12:55:37 +10:00
  • cd4268d219 Add manager dropdown UX Matt-Yorkley 2018-04-18 19:16:49 +01:00
  • c77a01815c Copy datepicker directive to utils module Rob Harrington 2018-03-21 12:25:03 +11:00
  • 386716088a Merge pull request #2190 from Matt-Yorkley/uk/bep_images_modal Pau Pérez Fabregat 2018-04-20 16:22:53 +02:00
  • 9a75728b6e Merge pull request #2231 from coopdevs/add-image-for-wiki Pau Pérez Fabregat 2018-04-20 09:26:17 +02:00
  • 58f3b5a97e Upgrade Spree to 2.0.4 instead of 2.0.13 Pau Perez 2018-04-18 08:56:03 +02:00
  • ef3ef2d4f3 Upgrade Rails to 3.2.22.5 to get security fixes Pau Perez 2018-04-16 12:47:57 +02:00
  • cd9d13cb2a Add images to be used in Spree upgrade wiki page Pau Perez 2018-04-17 17:53:25 +02:00
  • 89bc9380eb Merge pull request #2232 from coopdevs/skip-feature-spec-until-fixed Pau Pérez Fabregat 2018-04-17 20:54:20 +02:00
  • 9f06d1f809 Disable totally unreliable feature Pau Perez 2018-04-17 19:22:03 +02:00
  • ac37b0fc7e Merge pull request #2221 from Matt-Yorkley/uk/bep_images_ux Pau Pérez Fabregat 2018-04-17 18:05:20 +02:00
  • 06ef2a4c63 Remove commented out gem from Gemfile Pau Perez 2018-04-16 15:36:03 +02:00
  • 595a622d5b Removing useless spaces Hugo Daniel 2018-04-13 17:53:13 +02:00
  • d9f451b6fe Removing redundant curly braces Hugo Daniel 2018-04-13 11:58:13 +02:00
  • abe5d3596c Refactor Order#current_order argument Hugo Daniel 2018-04-12 19:29:09 +02:00
  • e6b58c6db4 Remove ssl deprecated configuration Hugo Daniel 2018-04-12 15:09:16 +02:00
  • 6f3663f1b9 update gemfile to spree 2.0.13 Hugo Daniel 2018-04-11 16:56:08 +02:00
  • 1abfe2ab8c Merge pull request #2199 from coopdevs/auto-correct-cops v1.14 Pau Pérez Fabregat 2018-04-16 14:58:28 +02:00
  • b1fc15f242 Merge pull request #2223 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-04-16 13:43:40 +02:00
  • fc7dd5d081 Merge pull request #2222 from coopdevs/upgrade-skylight Pau Pérez Fabregat 2018-04-16 11:38:23 +02:00
  • 2aea612f10 Upgrade to latest Skylight from 1.6.0 to 1.6.1 Pau Perez 2018-04-16 10:52:15 +02:00
  • 147a74f005 Fix Rubocop violations reported by Code Climate Pau Perez 2018-04-16 10:18:18 +02:00
  • 6a71aafce1 Update totals for empty order before sending email Rob Harrington 2018-04-11 13:40:42 +10:00
  • f5e77cdcec Ensure order total for uplaced subscription orders is zero Rob Harrington 2018-04-11 11:08:09 +10:00
  • 50ffd7ca01 Clear adjustments on subs orders when no items are able to be fulfilled Rob Harrington 2018-03-02 10:48:22 +11:00
  • 37ba1e6c83 Close modal when image updated successfully Matt-Yorkley 2018-04-15 18:22:10 +01:00
  • 5777d04821 Use angular translation filter on image upload modal Matt-Yorkley 2018-03-30 14:30:40 +01:00
  • 514ad5d898 Merge pull request #2208 from coopdevs/performance-monitoring-badge Pau Pérez Fabregat 2018-04-13 08:45:30 +02:00
  • 5822e60a66 Add Skylight's performance monitoring badge Pau Perez 2018-04-12 09:29:40 +02:00
  • ce2a7a510f Updating translations for config/locales/en_US.yml Transifex-Openfoodnetwork 2018-04-11 00:06:55 +10:00
  • 394fb91dd5 Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop Pau Perez 2018-04-09 17:43:11 +02:00
  • 1640d5ad0b Auto correct Rubocop's Layout/IndentHeredoc cop Pau Perez 2018-04-09 17:41:05 +02:00
  • 76fe1c7ee9 Auto correct Rubocop's Layout/IndentAssignment cop Pau Perez 2018-04-09 17:40:11 +02:00
  • 33ea2c0b07 Auto correct Rubocop's Layout/FirstParameterIndentation cop Pau Perez 2018-04-09 17:39:22 +02:00
  • f5a5d735fd Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop Pau Perez 2018-04-09 17:36:57 +02:00
  • 6593dea4f6 Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop Pau Perez 2018-04-09 17:34:50 +02:00
  • 3161fa3801 Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop Pau Perez 2018-04-09 17:33:16 +02:00
  • 746fcd5802 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop Pau Perez 2018-04-09 17:31:20 +02:00
  • 9da33b4e82 Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop Pau Perez 2018-04-09 18:46:11 +02:00
  • e876ef7df1 Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop Pau Perez 2018-04-09 17:22:52 +02:00
  • e4c86df7b2 Auto correct Rubocop's Layout/CaseIndentation cop Pau Perez 2018-04-09 17:19:47 +02:00
  • 15945fa1e0 Updating translations for config/locales/fr.yml Transifex-Openfoodnetwork 2018-04-05 04:48:54 +10:00
  • ad898848f8 Updating translations for config/locales/pt.yml Transifex-Openfoodnetwork 2018-04-05 04:29:49 +10:00
  • 236ba9328d Order cycles in specs comply with new date validations Rob Harrington 2018-03-07 14:41:13 +11:00
  • ce56e667a4 Use union operator instead of concatenate to load order cycle collection Rob Harrington 2018-03-07 13:56:00 +11:00
  • b17d8c2fe3 Add validation of open and close dates for order cycles Rob Harrington 2018-03-01 16:59:10 +11:00
  • b14f27f956 Return an error if no order_cycle_set params are submitted to #bulk_update action Rob Harrington 2018-03-01 16:44:36 +11:00
  • 18f7ec992d Refactor loading of OrderCycleSet in OrderCyclesController Rob Harrington 2018-03-07 12:29:27 +11:00
  • 46d2d6cb8a Include option text in dropdown cart even if the variant and product have the same name stveep 2018-03-25 12:32:33 +01:00
  • a2e4c33922 Remove old and useless sentence from welcome email Maikel Linke 2018-04-04 16:18:51 +10:00
  • 101269a487 Adjust wording on manager invite email Matt-Yorkley 2018-03-30 12:54:55 +01:00
  • 61fbdfcefc Merge pull request #2178 from HugsDaniel/2172_flexi_rate_miscalculated Maikel 2018-04-04 15:47:33 +10:00
  • 2a942da160 Use rspec context Hugo Daniel 2018-03-28 15:43:10 +02:00
  • bd97d08653 Remove stub after test and create two distinct calculators Hugo Daniel 2018-03-26 17:34:32 +02:00
  • 68ca352510 Use rspec expect syntax Hugo Daniel 2018-03-26 16:27:27 +02:00
  • a71b650f89 Added tests Hugo Daniel 2018-03-26 15:58:31 +02:00
  • f40bd9cfcb Fixing wrong incrementation Hugo Daniel 2018-03-26 14:03:09 +02:00
  • 843bca9ea3 Updated calculation for flexible rate Hugo Daniel 2018-03-26 14:01:30 +02:00
  • 80da0d5330 Set enterprise form dirty on any change Maikel Linke 2018-04-04 13:36:03 +10:00
  • 5ec89dde42 Update test sentences to fit new PriceSack behavior Hugo Daniel 2018-04-03 09:07:11 +02:00
  • 213456f4d9 Moved PriceSack tests from per item list to per order Hugo Daniel 2018-04-02 10:50:12 +02:00
  • 14ea591c7d Removed redundant self Hugo Daniel 2018-03-29 14:45:43 +02:00
  • 28009afbea Calculate price sack fees and tests Hugo Daniel 2018-03-28 19:53:59 +02:00
  • 357ff5fb7d Improve associating customer specs Matt-Yorkley 2018-03-03 12:42:42 +00:00
  • 5f2e72e3d4 Private shop spec Matt-Yorkley 2018-02-28 21:24:38 +00:00
  • 3b5c3f41a2 Ensure created users are associated with customers Em-AK 2017-03-21 18:20:14 +01:00
  • a83bdf16c9 Add error message for case when schedule cannot be deleted Rob Harrington 2018-02-22 15:08:26 +11:00
  • f9dbf61afc Merge pull request #2176 from HugsDaniel/2002_calculator_options_not_translated Maikel 2018-04-04 08:17:18 +10:00
  • 15bd0de971 Merge pull request #2194 from wrycoder/spec-deprecation-fix Pau Pérez Fabregat 2018-04-03 18:53:04 +02:00
  • 87329ad729 Merge pull request #2092 from ltrls/fix-tax-admin-order-show Pau Pérez Fabregat 2018-04-03 08:36:10 +02:00
  • 6731dd0b64 Overwrites spree_i18n translations for entreprise fees calculator's options Hugo Daniel 2018-03-26 11:34:13 +02:00
  • 0519269a53 Replacing deprecated #ignore with #transient Michael Toulouse 2018-04-02 06:40:12 -04:00
  • 1357c7c3b5 Merge pull request #2185 from coopdevs/remove-in-stock-dead-scope Pau Pérez Fabregat 2018-03-28 13:16:02 +02:00
  • 0cbd967007 Remove in_stock dead scope Pau Perez 2018-03-28 11:53:06 +02:00
  • 7fbaff71c7 Merge pull request #2179 from coopdevs/ignore-vendor-bundle Pau Pérez Fabregat 2018-03-28 11:29:56 +02:00
  • 9f6b3498bd Merge pull request #2177 from coopdevs/upgrade-delayed-job v1.13 Pau Pérez Fabregat 2018-03-27 17:45:33 +02:00
  • 0b9881b9d3 Merge pull request #2168 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-03-27 17:16:10 +02:00
  • 348364814d Updating translations for config/locales/es.yml Transifex-Openfoodnetwork 2018-03-28 02:11:09 +11:00
  • e8d8d5b0e6 Ignore Bundler's vendor/bundle Pau Perez 2018-03-27 16:56:58 +02:00