Commit Graph

  • dbf647f700 Merge pull request #1981 from Duende13/su_issue_1936 Pau Pérez Fabregat 2018-03-27 14:27:40 +02:00
  • ef2b0b8383 Added tooltips and locale Hugo Daniel 2018-03-12 21:45:58 +01:00
  • f75b865be8 Made changes requested by reviewer, in labels and tests. duende13 2017-12-01 23:17:29 +00:00
  • 7670d01c6d Changing SEO tab to 'Search' tab duende13 2017-11-30 12:31:20 +00:00
  • 61300a62c2 Added 'meta_keywords' to search of products in shop page. Changed labels on SEO tab and SEO form (edit product Screen) and added in en.yml file. duende13 2017-11-30 11:18:08 +00:00
  • a3fa6db5a9 Updating translations for config/locales/de_DE.yml Transifex-Openfoodnetwork 2018-03-26 21:38:21 +11:00
  • dae883c68d Upgrade dj_active_record from 4.0.2 to 4.1.2 Pau Perez 2018-03-26 12:31:16 +02:00
  • 808f7b12c7 Merge pull request #2175 from coopdevs/upgrade-skylight Pau Pérez Fabregat 2018-03-26 12:12:46 +02:00
  • 82c9cdd874 Upgrade Skylight from 1.5.1 to 1.6.0 Pau Perez 2018-03-26 11:13:29 +02:00
  • a257febc79 Updating translations for config/locales/fr.yml Transifex-Openfoodnetwork 2018-03-26 20:06:24 +11:00
  • 17b129ff4f Merge pull request #2079 from mjal/424cart-page-shouldnt-show-admin-handling-if-it-is-zero Pau Pérez Fabregat 2018-03-23 18:01:09 +01:00
  • 6ce552727b Merge pull request #2118 from oeoeaio/payment-summary-for-emails Pau Pérez Fabregat 2018-03-23 15:30:44 +01:00
  • dadc02fb11 Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails Pau Pérez Fabregat 2018-03-23 15:29:05 +01:00
  • bbd2427493 Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages Pau Pérez Fabregat 2018-03-23 15:27:55 +01:00
  • 82457d2b63 Merge pull request #2138 from Matt-Yorkley/email/manager_invite Pau Pérez Fabregat 2018-03-23 15:27:14 +01:00
  • 9e14186431 Merge pull request #2149 from oeoeaio/subs-remove-fields Pau Pérez Fabregat 2018-03-23 15:12:32 +01:00
  • d422283b76 Merge pull request #2128 from mkllnk/2113-i18n-config Pau Pérez Fabregat 2018-03-23 15:06:47 +01:00
  • 13115d4a2d Merge branch 'master' into email/manager_invite Pau Pérez Fabregat 2018-03-23 12:56:10 +01:00
  • 1005c299a2 Merge pull request #1464 from Matt-Yorkley/uk/bep_images Pau Pérez Fabregat 2018-03-23 12:40:16 +01:00
  • 3788ec590f Merge pull request #2166 from coopdevs/configure-mails-from Pau Pérez Fabregat 2018-03-23 12:19:31 +01:00
  • 7dd23d20c8 Merge pull request #2160 from coopdevs/fix-enterprise-filter-in-customers Pau Pérez Fabregat 2018-03-23 08:25:21 +01:00
  • 231dd7b6a2 Add some rubocop spaces stveep 2018-03-04 10:18:30 +00:00
  • 8a783bbb7d PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting stveep 2018-03-04 10:14:39 +00:00
  • 9375318c4b Codeclimate: remove empty line stveep 2018-02-12 21:46:31 +00:00
  • dc76b3922b Add sorting to query for producer mailer stveep 2018-02-10 16:56:03 +00:00
  • 40506685ef Adding extra sort step for variant name; ignore case in sorting line items by name stveep 2018-02-10 15:51:41 +00:00
  • f5ad950bc3 Change Syntax from :variant => :product to variant: :product Duende13 2017-07-23 19:26:37 +01:00
  • ba37db7ccc Refactoring test to adopt most Rspec syntax (expect instead of should) Duende13 2017-07-20 14:43:56 +01:00
  • 401052be68 Fix Robcop issues (blank spaces and indentation) Duende13 2017-07-20 14:00:44 +01:00
  • 330e7d71af Sort line items by name and unit_value for confirmation email and summary screen Duende13 2017-07-20 13:38:20 +01:00
  • 94cc8bb980 Update translations with current Transifex version Maikel Linke 2018-03-23 12:55:29 +11:00
  • 2c588847df Pick from_address from MailMethod as in Spree Pau Perez 2018-03-22 15:34:13 +01:00
  • 3c36d2d1a6 Remove failing mails_from default Pau Perez 2018-03-22 13:02:57 +01:00
  • fa9d61c7fd Merge pull request #2165 from coopdevs/upgrade-skylight Pau Pérez Fabregat 2018-03-22 09:56:35 +01:00
  • 92b5f9a313 Merge pull request #2127 from mkllnk/fix-scss Pau Pérez Fabregat 2018-03-22 09:41:11 +01:00
  • 9588138eb0 Remove typo Maikel Linke 2018-03-07 15:22:36 +11:00
  • d8dd84e64e Fix enterprise filter in customers page Pau Perez 2018-03-20 17:18:57 +01:00
  • ae1831241b Upgrade SKylight from 1.5.0 to 1.5.1 Pau Perez 2018-03-21 18:41:21 +01:00
  • 91f30d5427 Merge pull request #2148 from coopdevs/sample-mail-method Pau Pérez Fabregat 2018-03-21 15:10:56 +01:00
  • 3ce7bc54e3 Merge pull request #2143 from Matt-Yorkley/email/enterprise_user_ui Enrico Stano 2018-03-20 16:43:40 +01:00
  • 28bb15f4a9 Fix old rspec syntax Pierre de Lacroix 2018-03-06 01:28:04 +01:00
  • e0b12b1332 Remove dependency on model method in feature test Pierre de Lacroix 2018-03-06 01:19:36 +01:00
  • 2ceecc3d6e Test Order#tax_adjustment_totals with taxed adjustment on order Pierre de Lacroix 2018-02-20 18:08:52 +01:00
  • 03de6c690c Fix incorrect tax amount on Admin Order #show Pierre de Lacroix 2018-02-20 15:23:37 +01:00
  • 977c8f6203 Stick to setup+execution+assertion order in tests Pau Perez 2018-03-20 12:07:10 +01:00
  • e23d714e83 Merge pull request #2154 from openfoodfoundation/transifex v1.12 Pau Pérez Fabregat 2018-03-19 10:29:48 +01:00
  • ec01e55707 Updating translations for config/locales/es.yml Transifex-Openfoodnetwork 2018-03-19 19:56:02 +11:00
  • c18b996a1b Merge pull request #2098 from Matt-Yorkley/uk/font-caching Pau Pérez Fabregat 2018-03-17 11:10:04 +01:00
  • 1600067383 Redirect to set password page after invite Matt-Yorkley 2018-03-15 18:47:25 +00:00
  • 3fad51d271 Clearer angular method naming Matt-Yorkley 2018-03-15 16:53:27 +00:00
  • 5f0075f8b7 Refactor to use new REST resource Matt-Yorkley 2018-03-15 16:51:05 +00:00
  • 716e952117 Add mail setting's env vars for development Pau Perez 2018-03-16 13:24:17 +01:00
  • 092122969c Make mail env vars mandatory Pau Perez 2018-03-16 13:20:29 +01:00
  • f27a624687 Create the mail method from db:seed Pau Perez 2018-03-16 13:05:17 +01:00
  • 7afc999689 Differentiate MAIL_DOMAIN from plain DOMAIN Pau Perez 2018-03-15 23:53:29 +01:00
  • 4fc66356cb Create always a mail method from sample_data Pau Perez 2018-03-15 20:58:31 +01:00
  • a7f1ed660b Add service to create a mail method Pau Perez 2018-03-13 13:45:09 +01:00
  • 9840467b8a Remove obsolete subscription fields from order cycles table Rob Harrington 2018-03-16 14:55:22 +11:00
  • fa68dd0bcc refactor spec and check price Maxime Lalisse 2018-03-16 01:15:49 +01:00
  • 4d757dde78 Show payment summary in confirmation email regardless of payment method Rob Harrington 2018-03-07 11:40:30 +11:00
  • f3f18d8338 Cleaner routes.rb entry Matt-Yorkley 2018-03-13 22:04:04 +00:00
  • 128ca3b1ef Invite manager specs Matt-Yorkley 2017-09-29 16:52:10 +01:00
  • b64327fbb3 Invite enterprise manager functionality Matt-Yorkley 2017-09-29 15:16:02 +01:00
  • 5c6624e1d1 Tidy up setDirty() calls in enterprise_controller.js Matt-Yorkley 2018-03-15 12:56:40 +00:00
  • 98ea82462d Merge pull request #2136 from coopdevs/upgrade-test-dependencies Enrico Stano 2018-03-15 12:21:49 +01:00
  • 4953c69123 Fix enterprise user unsaved changes Matt-Yorkley 2018-03-14 01:36:56 +00:00
  • 586a9afaae Merge pull request #2125 from KeirOsborn/order_order_cycle_list_#1884 Pau Pérez Fabregat 2018-03-14 19:08:28 +01:00
  • f116ee156f Merge pull request #1951 from JF-Lalonde/remove_duplicate_datepicker_1947 Pau Pérez Fabregat 2018-03-14 19:08:06 +01:00
  • 7a9f341363 Remove duplicated directive datepicker from index_utils directory JF-Lalonde 2017-11-08 08:31:03 -07:00
  • ada0fa50fc Replace Rohan's email address by optional config Maikel Linke 2018-03-13 14:14:03 +11:00
  • 451c57da40 Changed i18n t() path to get content from locales HugsDaniel 2018-01-24 13:29:39 +01:00
  • 82a752de46 Added margin bottom on table#listing_products to display a bit above the save bar Hugo Daniel 2018-03-10 22:13:38 +01:00
  • e2f3feccf0 Add comments to authentication_service.js Matt-Yorkley 2018-03-13 14:12:34 +00:00
  • e6bdbccffa Ensure email links return to proper path on private shops, refactor modal logic Matt-Yorkley 2018-03-03 16:30:24 +00:00
  • ea9b0eca48 Adjust wording on validation modal message Matt-Yorkley 2018-03-03 15:42:40 +00:00
  • e8bc87e62b Ensure email validation link returns to /register paths properly Matt-Yorkley 2018-03-03 15:42:06 +00:00
  • d7a3c50bd5 Remove underscore from resource Matt-Yorkley 2018-02-23 12:49:54 +00:00
  • f5a0862655 Email confirmation modal specs Matt-Yorkley 2018-02-15 21:50:22 +00:00
  • 595bc5d1a5 Show confirmation message in modal Matt-Yorkley 2018-02-15 17:47:54 +00:00
  • bc621a3c43 Return user to same URL from confirmation link Matt-Yorkley 2018-02-15 15:47:31 +00:00
  • 7ebf5db1f2 Added img tag when producer.description.length==0 to display logo even when no About Us Hugs 2018-01-09 16:08:50 +01:00
  • e806f38142 Fix translation keys Maxime Lalisse 2018-02-08 01:41:07 +01:00
  • d980809a19 Upgrade shoulda-matchers from 1.1.0 to 2.8.0 Pau Perez 2018-03-13 15:35:55 +01:00
  • e6f6232607 Upgrade letter_opener from 1.4.1 to 1.6.0 Pau Perez 2018-03-13 14:21:54 +01:00
  • cce30d5762 Upgrade Knapsack from 1.5.1 to 1.16.0 Pau Perez 2018-03-13 14:11:00 +01:00
  • 47a6ffbf66 Upgrade Capybara from 2.15.4 to 2.18.0 Pau Perez 2018-03-13 13:58:06 +01:00
  • 7e5eae1b8d Added testing on statusMessage display for pending changes HugsDaniel 2018-01-24 13:42:54 +01:00
  • 8c4d0f11d7 Changed status message with i18n t() filter to displau unsaved changes status for customers edition in admin dashboard HugsDaniel 2018-01-24 13:41:16 +01:00
  • d96c1fc165 Upgrade factory_girl_rails from 3.3.0 to 4.9.0 Pau Perez 2018-03-13 10:01:14 +01:00
  • 6f879cd5d9 Remove unused gem Turn Pau Perez 2018-03-13 09:54:26 +01:00
  • 1d75e5a671 Upgrade rspec-retry from 0.4.2 to 0.5.6 Pau Perez 2018-03-13 09:53:20 +01:00
  • bdd58dccf0 Upgrade Timecop from 0.8.1 to 0.9.1 Pau Perez 2018-03-13 09:34:09 +01:00
  • aaf5bcbb12 Upgrade rspec-rails from 3.7.1 to 3.7.2 Pau Perez 2018-03-13 09:32:12 +01:00
  • 976bbd8725 Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator Pau Pérez Fabregat 2018-03-13 08:51:11 +01:00
  • 341604be8a Merge pull request #2094 from openfoodfoundation/transifex Enrico Stano 2018-03-13 08:39:11 +01:00
  • 01dc51c84b Consistent reference of the source locale Maikel Linke 2018-03-13 10:25:31 +11:00
  • 64063f305b Describe methods of I18nConfig Maikel Linke 2018-03-13 10:24:42 +11:00
  • 5ce320f8a2 Merge pull request #2133 from coopdevs/fix-sample-data Enrico Stano 2018-03-12 18:39:34 +01:00
  • 6598c80f6e Fix shipping method creation in sample data Pau Perez 2018-03-12 13:42:59 +01:00
  • d4b84e55c2 order order cycle list from most lates close date to earliest on /orders page #1884 Keir Osborn 2018-03-09 12:15:14 +00:00