Commit Graph

  • c9862535f8 Import required colour definitions in SCSS Maikel Linke 2018-08-14 09:48:25 +10:00
  • 8681618490 Fixed CodeClimate scss feedback on cookies banner and policy page css luisramos0 2018-08-13 18:44:38 +01:00
  • ccd5147b11 Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration luisramos0 2018-08-13 17:25:51 +01:00
  • 1c20967ca4 Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile luisramos0 2018-08-04 20:00:24 +01:00
  • bff5581a42 Added functional tests for cookies related features: cookies policy page, cookies banner and privacy policy link luisramos0 2018-08-04 18:46:24 +01:00
  • 4b64369ddb Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO) luisramos0 2018-07-21 15:09:03 +01:00
  • ca35c59e52 Moved the footer TOS URL from the content settings to the new section legal settings in the global settings luisramos0 2018-07-20 15:20:26 +01:00
  • d920c32376 Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO luisramos0 2018-06-29 14:39:31 +01:00
  • 92f9cbd00a Added new cookies banner (with link to cookie policy page and the accept cookies button) luisramos0 2018-06-28 01:52:09 +01:00
  • 08c5d8f3ab Added new cookies policy page and added a link to it in the footer (cookies policy link) luisramos0 2018-06-24 16:10:24 +01:00
  • 362ed8ed08 Changed modals max height from 120% to 100% so that the content in the modal is never outside the viewport luisramos0 2018-06-24 16:10:02 +01:00
  • 4f751eb3e3 Updating translations for config/locales/nb.yml Transifex-Openfoodnetwork 2018-08-13 17:08:33 +10:00
  • 910c1d437d Merge pull request #2536 from openfoodfoundation/transifex Maikel 2018-08-13 15:48:11 +10:00
  • 0b9061df28 removed Cart route, controller, model and specs: dead code luisramos0 2018-08-11 22:17:12 +01:00
  • 6c306aa1dd Updating translations for config/locales/fr.yml Transifex-Openfoodnetwork 2018-08-10 21:09:21 +10:00
  • 3b1bd53d3a Added basic integration with Matomo luisramos0 2018-07-21 16:05:58 +01:00
  • 6251c72921 Add divider between admin enterprise index actions Kristina Lim 2018-08-03 19:38:40 +08:00
  • 17978f58c7 Rename edit link in admin enterprise index Kristina Lim 2018-08-03 19:17:59 +08:00
  • 295604b689 Change heading for edit enterprise page Kristina Lim 2018-07-20 13:00:18 +08:00
  • 0b4fcf8a14 Change enterprise "Manage" button to "Settings" Kristina Lim 2018-07-20 12:56:33 +08:00
  • b91019ad64 Split translation key for enterprise manage button Kristina Lim 2018-07-20 12:53:41 +08:00
  • 9dcbd9076e Override in_stock? to prepare for Spree 2.0 Maikel Linke 2018-06-28 15:39:15 +10:00
  • b84e524f2d Prepare inventory report for Spree upgrade Maikel Linke 2018-06-28 14:55:24 +10:00
  • 289d0b937f Style ScopeVariantToHub Maikel Linke 2018-06-28 13:57:45 +10:00
  • 27ddb712c1 Remove unused scope Spree::Variant.in_stock Maikel Linke 2018-06-27 17:04:01 +10:00
  • 33f6dc21e7 Merge pull request #2516 from kristinalim/cleanup-move_admin_and_spree_from_routes Maikel 2018-08-09 10:10:49 +10:00
  • f93ed0de85 Merge pull request #2519 from mkllnk/more-efficient-login-in-specs Maikel 2018-08-09 10:05:54 +10:00
  • 03468efa7e Merge pull request #2346 from oeoeaio/subs-totals Maikel 2018-08-07 18:17:13 +10:00
  • 9aff9fbce2 Remove empty spec Maikel Linke 2018-08-07 15:37:03 +10:00
  • b628ead525 Speed up shipping methods spec Maikel Linke 2018-08-07 15:31:46 +10:00
  • 54552f2be7 Speed up admin schedules spec Maikel Linke 2018-08-07 15:10:57 +10:00
  • 819a173167 Speed up reports spec Maikel Linke 2018-08-07 15:04:00 +10:00
  • aa677a117b Speed up admin products spec Maikel Linke 2018-08-07 14:58:23 +10:00
  • eb550505ae Speed up admin payment method spec Maikel Linke 2018-08-07 14:50:38 +10:00
  • 9023b16395 Speed up admin orders spec Maikel Linke 2018-08-07 14:45:57 +10:00
  • 71a381e48e Speed up order cycles spec Maikel Linke 2018-08-07 14:32:52 +10:00
  • f4cd5a7e4b Speed up admin enterprise spec Maikel Linke 2018-08-07 14:11:03 +10:00
  • 121bc51feb Speed up admin enterprises spec Maikel Linke 2018-08-07 13:54:29 +10:00
  • f0da823445 Speed up enterprise user spec Maikel Linke 2018-08-07 12:41:07 +10:00
  • e4ebeb8a29 Remove dead spec code Maikel Linke 2018-08-07 12:37:49 +10:00
  • 0b39054954 Speed up relationships spec Maikel Linke 2018-08-07 12:33:26 +10:00
  • 126f312c6b Make spec more robust not relying on order Maikel Linke 2018-08-07 12:30:59 +10:00
  • edb32218b0 Use quick login to speed up product edit spec Maikel Linke 2018-08-07 12:11:15 +10:00
  • 0edf393c12 Use quick login to speed up spec Maikel Linke 2018-08-07 10:56:42 +10:00
  • 30fad228c5 Remove code duplication in spec helper Maikel Linke 2018-08-07 09:24:31 +10:00
  • 32846af230 Merge pull request #2517 from kristinalim/cleanup-disable_rubocop_cop_rails_activerecordaliases Maikel 2018-08-07 09:11:00 +10:00
  • d77a94335b Update .rubocop_todo.yml Kristina Lim 2018-08-06 18:23:44 +08:00
  • a494fb274e Disable rubocop cop Rails/ActiveRecordAliases Kristina Lim 2018-08-06 18:12:35 +08:00
  • b67c8cc9f1 Improve requiring of additional routes Kristina Lim 2018-08-06 09:58:40 +08:00
  • 4d34693c05 Move Spree route customizations from main file Kristina Lim 2018-08-06 09:55:52 +08:00
  • 72036a4993 Move admin routes from main file Kristina Lim 2018-08-06 09:54:54 +08:00
  • f0be8ff290 Style proxy order serializer Maikel Linke 2018-08-03 15:07:22 +10:00
  • b736560d63 Inform about inaccurate subscription totals Maikel Linke 2018-08-03 14:59:27 +10:00
  • c8397024e4 Streamline Product Import UX flow v1.18.0 Matt-Yorkley 2018-07-26 15:55:42 +01:00
  • d5fdda1c46 Fix typo translating Enterprises Maikel Linke 2018-08-03 11:56:09 +10:00
  • c48889f368 Remove duplicate translation key Maikel Linke 2018-08-03 11:52:39 +10:00
  • cead905d05 Use estimated subscription total for proxy orders if order has not been initialized Rob Harrington 2018-05-30 12:49:11 +10:00
  • fb93351386 Show fee breakdown in line items panel if present Rob Harrington 2018-05-30 12:48:25 +10:00
  • d726b0a851 Merge pull request #2509 from coopdevs/update-spree-fork-version Maikel 2018-07-31 09:26:00 +10:00
  • f04903bca0 Merge pull request #2493 from HugsDaniel/2433-change-from-simple-product-to-base-product Maikel 2018-07-31 07:40:42 +10:00
  • ce46f3de39 Removed empty line Hugo Daniel 2018-07-30 12:11:02 +02:00
  • c4b23b62d0 Update Spree's fork revision in Gemfile Pau Perez 2018-07-27 15:18:37 +02:00
  • 915531acc4 Add section about documentation updates Maikel 2018-07-30 14:44:07 +10:00
  • 8ecc786b99 Include bug severity in issue template Maikel 2018-07-30 14:28:01 +10:00
  • 43bf7293bf Merge branch 'master' into 2-0-stable Pau Perez 2018-07-27 10:21:47 +02:00
  • 67bac8aae4 Merge pull request #2503 from coopdevs/upgrade-spree-2-0-4-version Pau Pérez Fabregat 2018-07-27 08:51:06 +02:00
  • 238a07dbd6 Merge pull request #2488 from HugsDaniel/2434-remove-dash-dependency Maikel 2018-07-27 13:00:15 +10:00
  • 7f26b1494b Fix syntax error in GETTING_STARTED.md Rob H 2018-07-27 12:49:18 +10:00
  • eb89b74022 Fix syntax error in README.md Rob H 2018-07-27 12:48:37 +10:00
  • 6fb95d30c3 Update Gemfile.lock to fetch the latest revision Pau Perez 2018-07-26 12:17:05 +02:00
  • 5a4bc0c584 Merge pull request #2366 from coopdevs/refactor-ship-address-from-distributor Pau Pérez Fabregat 2018-07-26 12:04:02 +02:00
  • 933ff63de2 Merge pull request #2389 from luisramos0/bulk_prod_edit_fix Maikel 2018-07-26 14:09:21 +10:00
  • 3f91850301 Merge pull request #2499 from mkllnk/update-com-links-in-readme Maikel 2018-07-26 11:39:29 +10:00
  • a16058f52a Fix link syntax errors in REAME.md and GETTING_STARTED.md Rob Harrington 2018-07-24 20:39:34 +10:00
  • 02331221ef Merge pull request #2471 from Matt-Yorkley/pi/post_save Maikel 2018-07-26 11:26:51 +10:00
  • 2ceb969925 Style recently merged code Maikel Linke 2018-07-26 10:52:56 +10:00
  • f0f9662957 Update gem i18n-js to pick up locale changes Maikel Linke 2018-07-23 16:16:04 +10:00
  • 97e61dc6f9 Merge pull request #2498 from Matt-Yorkley/embedded_mobile Pau Pérez Fabregat 2018-07-25 15:10:46 +02:00
  • eaf108718c Add doc to method Pau Perez 2018-07-25 13:52:05 +02:00
  • a0d2ec5666 Enable OFN's custom OrderUpdater Pau Perez 2018-07-25 13:51:01 +02:00
  • d1e65691cf Copy distributor addr. when using a pick up method Pau Perez 2018-06-08 12:57:17 +02:00
  • f1896313b3 Move shipping_address_from_distributor to OrderUpdater Pau Perez 2018-06-08 12:32:38 +02:00
  • 21d905a092 Refactor OrderUpdater to decorate Spree's one Pau Perez 2018-06-08 11:31:57 +02:00
  • 72f02ee1ee RSpec3-ize OrderUpdater spec Pau Perez 2018-06-08 11:23:27 +02:00
  • ae5fd864d1 Fix embedded shopfront menu responsiveness Matt-Yorkley 2018-07-23 12:43:00 +01:00
  • a3cace46e0 Merge pull request #2431 from mkllnk/2007-no-shipment-for-payment Pau Pérez Fabregat 2018-07-25 08:46:47 +02:00
  • eab04e0d86 Reimplement Spree<2.0 :simple_product factory in OFN Hugo Daniel 2018-07-24 16:27:30 +02:00
  • ec751c0a78 Remove admin analytics ability Hugo Daniel 2018-07-24 15:27:22 +02:00
  • 5db5bc65c0 Add communications links to README Maikel Linke 2018-07-24 11:18:54 +10:00
  • ffd3d28889 Merge pull request #2474 from Matt-Yorkley/pi/import_options Maikel 2018-07-24 10:34:14 +10:00
  • 30be40ebd9 Merge pull request #2441 from kristinalim/fix-scoping_issue_in_sorting_of_tables Maikel 2018-07-24 10:31:13 +10:00
  • 26d6ca4a54 Merge pull request #2487 from coopdevs/stricter-code-climate Pau Pérez Fabregat 2018-07-23 12:42:06 +02:00
  • 687d7c5f38 Merge pull request #2483 from coopdevs/fix-setup-script Pau Pérez Fabregat 2018-07-23 12:31:50 +02:00
  • b60bada542 Merge pull request #2495 from mkllnk/remove-newrelic Pau Pérez Fabregat 2018-07-23 11:19:27 +02:00
  • 14480b920e Fix script/setup by making it less clever Pau Perez 2018-07-18 18:51:31 +02:00
  • 67767f86eb Change import and reset logic to work with first page Matt-Yorkley 2018-07-15 16:26:40 +01:00
  • bd200c885b Move options to first page Matt-Yorkley 2018-07-15 13:15:26 +01:00
  • 89ac558f37 Fix wrong sort predicates in customer index Kristina Lim 2018-07-20 11:45:07 +08:00
  • 47608525c6 Reset reverse when clicking another column to sort Kristina Lim 2018-07-20 09:27:16 +08:00
  • 5179f7fd63 Move logic for toggling by column into SortOptions Kristina Lim 2018-07-20 09:25:55 +08:00