Commit Graph

  • 513330cfff Add JSON api for products clone enricostano 2017-04-05 14:23:18 +02:00
  • 1136cb40a9 Revert to OFN spree fork Em-AK 2017-04-05 11:13:17 +02:00
  • e73330d597 Fix removal of product properties Em-AK 2017-04-04 16:55:36 +02:00
  • f22a12d657 Revert later: depend on our spree fork Em-AK 2017-04-04 11:41:23 +02:00
  • d68104cecb Update a dependency to run the specs Em-AK 2017-04-03 20:16:29 +02:00
  • 5eb42eac3c Delete the override of a deleted field Em-AK 2017-04-03 18:06:29 +02:00
  • ac8cfe24e6 Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR Rohan Mitchell 2016-12-23 15:10:36 +11:00
  • bfaaf16030 Fix spree adjustments fix that maybe never worked? Rohan Mitchell 2016-12-23 15:08:12 +11:00
  • c47af55bb9 Fix: When a user fires an event (eg. capture payment), take them back to where they came from Rohan Mitchell 2016-12-08 13:08:30 +11:00
  • 3ff051f238 Restore route for variant search. Fixes admin order product selection. Rohan Mitchell 2016-12-08 12:59:53 +11:00
  • 0a8e8dfbbb Add specs and fix line items HTML response Rohan Mitchell 2016-12-08 11:10:19 +11:00
  • 1170897587 Add our own JSON handling actions for update and delete. Spree no longer does this for us. Rohan Mitchell 2016-11-25 12:55:12 +11:00
  • 73abb93737 Update Spree: Bring forward simplified version of Spree.t for spree_auth_devise Rohan Mitchell 2016-11-18 15:46:47 +11:00
  • 0a043a6919 Add permissions to :line_item resource, now called by Spree Rohan Mitchell 2016-11-18 12:13:39 +11:00
  • 2c374b448a check_authorization removed in Spree. Add load_order before_filter to cover our custom actions. Rohan Mitchell 2016-11-18 12:00:11 +11:00
  • 2a44b190fe Use spree_paypal_express 2-0-stable pretending to be 1.3 Rohan Mitchell 2016-11-09 14:46:34 +11:00
  • 3605b610fe Use spree_auth_devise 2-0-stable pretending to be 1.3 Rohan Mitchell 2016-11-09 14:37:49 +11:00
  • 0219118e19 Admin JS/CSS now in spree_backend Rohan Mitchell 2016-11-09 14:37:04 +11:00
  • 5ad197278c Fix rendering of order form for JSON requests Rohan Mitchell 2016-11-09 14:04:09 +11:00
  • 3135ef6b7f Reinstate explicit class name Spree::Calculator on calculated_adjustments association Rohan Mitchell 2016-11-09 12:47:57 +11:00
  • 0446b8d72f TestingSupport moved out of Core namespace Rohan Mitchell 2016-11-04 15:30:46 +11:00
  • 858576d870 CalculatedAdjustments requires include first Rohan Mitchell 2016-11-04 15:30:22 +11:00
  • 48e50540db Start Spree upgrade step 3 Rohan Mitchell 2016-11-04 14:06:07 +11:00
  • 8eca260297 Update Spree: Prevent duplicate copies of images appearing Rohan Mitchell 2016-11-04 12:44:07 +11:00
  • 017b63fa71 Update Spree: Fix further admin authorization errors Rohan Mitchell 2016-11-04 12:08:48 +11:00
  • efe0d3ab22 Update spree, upgrading jquery-rails to provide jquery 1.9. Fixes ng-tags-input. Rohan Mitchell 2016-11-04 11:18:05 +11:00
  • bfd54ef621 Update Spree: Fix admin authorization errors Rohan Mitchell 2016-11-04 10:43:46 +11:00
  • 38da4c8e12 Adjustments now have state instead of locked/unlocked Rohan Mitchell 2016-09-16 15:02:55 +10:00
  • b5d33fc4b5 Add migrations from Spree Rohan Mitchell 2016-09-16 12:46:46 +10:00
  • f5c4537afa Start Spree upgrade step 2 Rohan Mitchell 2016-09-16 12:33:53 +10:00
  • 09aed63cd4 Add todos to remove redundant i18n keys Saimon Moore 2017-09-08 13:57:50 +02:00
  • 757f886af5 Use proper namespaced translations Saimon Moore 2017-09-08 13:35:19 +02:00
  • f73f0d4bf9 Use proper namespaced translations Saimon Moore 2017-09-08 12:50:54 +02:00
  • d4f7efd08a Use proper namespaced translations Saimon Moore 2017-09-08 12:49:08 +02:00
  • a1aac7643a Translate Entp registration modal tab titles Saimon Moore 2017-09-08 12:47:53 +02:00
  • 36022fb143 Merge pull request #1815 from leandroalemao/missing-translations-edit-product-page Enrico Stano 2017-09-08 10:57:25 +02:00
  • c70de9f73c Fix i18n translation keys for Edit Product Page leandroalemao 2017-09-06 18:32:33 +01:00
  • d3d4628e29 Add doc Pau Perez 2017-09-08 09:51:06 +02:00
  • 942ab55ddc Disable create profile from signup when submitting Pau Perez 2017-09-07 15:59:07 +02:00
  • 86460ffbde Merge pull request #1792 from leandroalemao/missing-translations-new-product-page Enrico Stano 2017-09-04 16:07:15 +02:00
  • 90d1d5400a Fix i18n translation keys for New Product Page Leandro C 2017-09-02 20:07:59 +01:00
  • 1b151ee015 Add missing translations in registration wizard Pau Perez 2017-09-01 14:57:16 +02:00
  • 3a04136705 Merge pull request #1758 from coopdevs/simplify-karma-rake-task Enrico Stano 2017-08-28 10:21:41 +02:00
  • 880fda7b40 Merge pull request #1775 from openfoodfoundation/transifex v1.8.14 Maikel 2017-08-25 16:48:51 +10:00
  • 67b992cf44 Merge pull request #1771 from coopdevs/feature/add-enterprise-relationhips-tab-name Enrico Stano 2017-08-23 17:40:37 +02:00
  • a1a2a66d21 Updating translations for config/locales/fr.yml [skip ci] v1.8.13-translated Transifex-Openfoodnetwork 2017-08-21 06:20:59 +10:00
  • 0117e2e8b5 Updating translations for config/locales/es.yml [skip ci] Transifex-Openfoodnetwork 2017-08-19 02:22:36 +10:00
  • 8645b4a7f6 Translate Enterprise Relationships tab name Enrico Stano 2017-08-18 16:40:32 +02:00
  • a76b64b80b Spec for missing password confirmation Matt-Yorkley 2017-07-16 11:51:43 +01:00
  • 483db2bc29 Fix signup password confirmation Matt-Yorkley 2017-07-18 13:41:52 +01:00
  • bd3f626872 Call toScroll after any new panel is . Also added an actual delay as it still scrolled to the 'old' location.. 10 ms was too short to allow the location to update after the old panel closes (on Chrome), 50 ms seems ok. stveep 2017-08-02 22:52:20 +01:00
  • 2650dc209e Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-08-12 20:52:20 +10:00
  • efd3c34a0c Change JS I18n.fallbacks to be less confusing Julius Pabrinkis 2017-08-12 11:21:47 +01:00
  • 3e01636f77 Add missing i18n-js partial to registration layout Julius Pabrinkis 2017-08-12 11:20:58 +01:00
  • f9c0edf4b9 Always execute local karma Pau Perez 2017-08-09 18:21:25 +02:00
  • 58d7d8f016 Merge pull request #1753 from coopdevs/complete-seed-data Enrico Stano 2017-08-11 15:42:03 +02:00
  • 1fbb4b25d1 Merge pull request #1746 from oeoeaio/fix-flash-error-color Enrico Stano 2017-08-11 11:45:31 +02:00
  • b43b92dcfd Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-08-11 18:16:25 +10:00
  • 649c25622a Add doc to method Pau Perez 2017-07-12 10:44:11 +02:00
  • 1f2820f6d4 Add #delivery? in ShippingMethod Pau Perez 2017-06-27 11:07:30 +02:00
  • 22f018f2bc Fix all specs of LastUsedAddress Pau Perez 2017-06-27 13:20:50 +02:00
  • 8c5ac4cb23 Fix extra empty line reported by rubocop Pau Perez 2017-08-10 11:35:15 +02:00
  • b9ff5674af Correction for Transifex name mismatch Lynne 2017-08-04 16:18:57 +01:00
  • f0968109c6 Copy transifex updates to en-GB Lynne 2017-08-03 20:33:26 +01:00
  • eeb41ccfdd Updating translations for config/locales/en_GB.yml [skip ci] Transifex-Openfoodnetwork 2017-08-04 04:30:40 +10:00
  • 587a53d36d Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-08-04 03:56:40 +10:00
  • ec7b7e0391 Updating translations for config/locales/sv.yml [skip ci] Transifex-Openfoodnetwork 2017-08-03 17:43:53 +10:00
  • 7f982c0c90 Complete seed data to purchase to Enterprise 2 Pau Perez 2017-07-27 12:56:27 +02:00
  • 6c71ef8760 Fix styling of error flash in admin section Rob Harrington 2017-03-02 13:49:08 +11:00
  • 936355d54b Merge pull request #1681 from coopdevs/release-notes-in-template Enrico Stano 2017-08-02 10:59:30 +02:00
  • 07620c2e62 Merge pull request #1707 from oeoeaio/mirror-db-session-data Enrico Stano 2017-08-02 10:45:46 +02:00
  • 686a8f3af9 Add legacy and default values for LOCALE Maikel Linke 2017-08-02 10:44:55 +10:00
  • 199bfe531e Correct typo in comment Maikel Linke 2017-08-02 10:01:12 +10:00
  • e4627fe0d0 Update README Julius Pabrinkis 2017-06-08 22:36:12 +01:00
  • ec6a365227 Add test coverage for switching language in darkswarm and admin Julius Pabrinkis 2017-06-08 22:36:03 +01:00
  • c6f6f5bc55 Adapt karma js tests for i18n-js Julius Pabrinkis 2017-06-08 22:35:28 +01:00
  • 5166a3d958 Add available_locales config feature Julius Pabrinkis 2017-06-08 22:35:00 +01:00
  • 9429695e15 Add i18n helper for controllers to switch language by params Julius Pabrinkis 2017-06-08 22:33:57 +01:00
  • f396d30747 Render i18n-js config inside darkswarm and admin layouts Julius Pabrinkis 2017-06-08 22:32:43 +01:00
  • 2637574c93 Require new i18n-js translations in darkswarm and admin Julius Pabrinkis 2017-06-08 22:29:54 +01:00
  • d2ba4650e5 Add temporary i18n-js workaround for Spree translations until upgrade Julius Pabrinkis 2017-06-08 22:27:52 +01:00
  • 3adb13e62c Add i18n-js gem Julius Pabrinkis 2017-06-08 22:25:57 +01:00
  • f69d86ab8f Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2017-07-31 20:50:37 +10:00
  • 7c0feab08f Fix #1526: add descriptions for reports *before* they are filtered v1.8.13 Rob Harrington 2017-07-28 16:13:46 +10:00
  • ea784d6362 Invoice date and translation adjustments Matt-Yorkley 2017-07-13 18:08:50 +01:00
  • 6e57f917d2 Merge pull request #1736 from oeoeaio/fix-zeus-crash Maikel 2017-07-28 16:31:41 +10:00
  • ba97f61c9e Move translations into right scope Maikel Linke 2017-07-28 12:06:57 +10:00
  • c5eca68d79 Remove unused translation Maikel Linke 2017-07-28 11:14:47 +10:00
  • 92814162dc Remove unused translation Maikel Linke 2017-07-28 11:13:23 +10:00
  • 44374e8499 Display "+1 More" correctly Maikel Linke 2017-07-28 11:10:23 +10:00
  • 2ca04bb84e Revert translations of LettuceShare report headers Rob Harrington 2017-07-28 10:39:36 +10:00
  • 66a85bb99f Revert translations of Xero report headers Rob Harrington 2017-07-28 10:30:54 +10:00
  • 9f6931ba18 Move embedded shopfronts iframe view into spec/support/views Rob Harrington 2017-07-28 11:54:48 +10:00
  • 8fe6800151 Add documentation to the top of mirror_db script Rob Harrington 2017-07-27 12:58:11 +10:00
  • e86122cb3e Exclude session data when mirroring data Rob Harrington 2017-07-20 12:37:47 +10:00
  • 7641dcc1be Add media query to panepadding mixin Laura Turk 2017-07-19 13:11:04 -06:00
  • 8648070a05 Add disabled class to shopfront property selectors Leta Keane 2017-07-19 12:09:58 -06:00
  • 5200937165 Safari/iOS iframe issue fix Matt-Yorkley 2017-07-06 19:20:49 +01:00
  • 6215777986 Shopfront review adjustments Matt-Yorkley 2017-05-29 15:06:56 +01:00
  • 0eb4c7f7ba Require https for embedding sites Matt-Yorkley 2017-05-27 11:25:25 +01:00