Commit Graph

  • 656be690a3 Remove space from permalink tip Maikel Linke 2017-03-15 12:11:56 +11:00
  • 167045f695 Remove forgotten " character Maikel Linke 2017-03-15 12:01:31 +11:00
  • dbe968afbb Fixing translated interpolation in fr locale François Turbelin 2017-03-12 12:42:00 +01:00
  • 179b995fa0 Fixing wrong string interpolation in i18n files François Turbelin 2017-03-12 12:41:06 +01:00
  • 4791086207 Fixing i18n multiline issues François Turbelin 2017-03-12 12:39:29 +01:00
  • be6b09a6e0 Adding i18n keys on JS templates François Turbelin 2017-03-12 12:21:38 +01:00
  • f235099859 Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2017-03-11 16:50:17 +11:00
  • ff8ca521ff Open tos pdf in new tab Matt-Yorkley 2017-02-06 16:04:03 +00:00
  • 98f7d52493 Refactor: wrapping registration templates in script tags Rob Harrington 2017-01-12 14:01:08 +11:00
  • 4815405839 WIP: Moving registration templates in app/views as partials Rob Harrington 2017-01-12 13:08:49 +11:00
  • 42a6e35185 Making registration spec click_and_ensure assertions more generic Rob Harrington 2017-01-12 12:11:32 +11:00
  • 408a57479e Flaky tests Matt-Yorkley 2016-12-09 01:11:46 +00:00
  • beaf54107c Moved angular template to views folder Matt-Yorkley 2016-12-08 15:44:17 +00:00
  • e45d1d42b4 Tidying up Matt-Yorkley 2016-12-02 21:50:22 +00:00
  • bc442c7819 Re-adding a line removed in testing Matt-Yorkley 2016-12-02 19:47:48 +00:00
  • 6a361f2d7b Specced the new terms of service functionality Matt-Yorkley 2016-12-02 19:41:47 +00:00
  • a62998e5f1 Enterprise Terms of Service Matt-Yorkley 2016-12-01 18:00:55 +00:00
  • ebcb8ff3e7 Finishing Translations keys implemtentation on Admin ERB views François Turbelin 2017-02-19 13:47:23 +01:00
  • da8c107331 Merge remote-tracking branch 'origin/master' into transifex Maikel Linke 2017-02-15 15:47:25 +11:00
  • 5870927518 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-02-10 16:42:27 +11:00
  • e008a154e5 Updating translations for config/locales/sv.yml [skip ci] Transifex-Openfoodnetwork 2017-02-09 02:36:14 +11:00
  • a2d01b5144 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-02-08 16:53:53 +11:00
  • 8afd5c509b Using coffescript syntax to check for presence of enterprise_form Rob Harrington 2017-02-08 15:41:56 +11:00
  • 311f72e4cb Fixing JS spec failure Matt-Yorkley 2016-12-11 01:24:37 +00:00
  • 78563a7d75 Changed for build failure Matt-Yorkley 2016-12-10 19:41:34 +00:00
  • 9284dd9b63 Enable save after deleting enterprise manager Matt-Yorkley 2016-12-10 18:38:44 +00:00
  • 92981e4fcd Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-02-08 10:38:47 +11:00
  • 9235727d45 Merge pull request #5 from mkllnk/pr-1329-enterprise-switcher Matt-Yorkley 2017-02-02 15:26:01 +00:00
  • fc4ead9b05 Ensure on_demand set properly on new products Matt-Yorkley 2017-02-02 01:06:20 +00:00
  • b8622e95b7 Re-use NavigationCheck logic Maikel Linke 2017-01-11 15:54:00 +11:00
  • f8341dccd4 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-02-01 10:35:53 +11:00
  • b8ed7789f0 Merge pull request #1427 from openfoodfoundation/revert-1424-master Lynne 2017-01-30 13:18:16 +00:00
  • 6d19613ecc Revert "translate ABN and ACN to company number, charity number" Lynne 2017-01-30 12:53:01 +00:00
  • 0d56cbf169 Merge pull request #1424 from OliverUK/master Lynne 2017-01-30 12:04:54 +00:00
  • 67730e82c3 Update en-GB.yml Lynne 2017-01-30 12:04:24 +00:00
  • 940ca7ade1 translate ABN and ACN to company number, charity number OliverUK 2017-01-27 15:02:38 +00:00
  • 05f9747f15 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-25 12:41:02 +11:00
  • 27903ab744 Merge branch 'master' into uk/switcher Matt-Yorkley 2017-01-22 18:57:25 +00:00
  • 931e528e14 Code review changes Matt-Yorkley 2017-01-22 18:55:28 +00:00
  • 6bed94a09b Include E2E permissions Matt-Yorkley 2017-01-22 18:42:23 +00:00
  • 165b437f31 #1226: fix OSM URL to use HTTPS Paul Mackay 2017-01-20 15:59:22 +00:00
  • b526307ad1 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-18 18:14:10 +11:00
  • a7bfddfcb5 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-18 17:22:21 +11:00
  • 52e4722dcb Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-18 11:19:57 +11:00
  • 017916b193 Enterprise distributing_products scope uses INNER JOINS instead of OUTER JOINS v1.8.7.1 Rob Harrington 2017-01-05 12:17:24 +11:00
  • 02e5ba4dfd Convert .sass files to .scss format Paul Mackay 2017-01-15 12:11:53 +00:00
  • 651626eb4f #1365: Remove /test dir as it is not used Paul Mackay 2017-01-14 11:47:21 +00:00
  • 20d01c3047 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-13 11:44:47 +11:00
  • a391b6f076 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-13 11:12:17 +11:00
  • ade73f66c8 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-13 10:50:32 +11:00
  • 44970a13bb Fix translation of email confirmation notice Maikel Linke 2017-01-13 10:21:25 +11:00
  • d80f080af5 #1027: Use url helpers for basic pages Paul Mackay 2017-01-12 10:18:30 +00:00
  • 6ec7276cfc Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-11 16:30:37 +11:00
  • 2444d3b547 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2017-01-11 15:54:08 +11:00
  • e899633aff Merge duplicate locale entry admin.enterprises.index Maikel Linke 2017-01-11 14:48:05 +11:00
  • a9f01c0f0d Fix typos in en.yml Maikel Linke 2017-01-11 11:15:44 +11:00
  • e021afdd8a Updated spec Matt-Yorkley 2017-01-10 23:53:13 +00:00
  • 88dea0f2b8 Adding i18n keys on Admin side (Rails views) François Turbelin 2016-12-13 16:53:32 +01:00
  • 5150025641 Updated tag rules UI Matt-Yorkley 2017-01-10 22:54:22 +00:00
  • fc400741b4 Remove lastmod for groups Paul Mackay 2017-01-10 11:44:57 +00:00
  • 5cb2194f5e #1027: Add sitemap.xml generation Paul Mackay 2017-01-10 11:39:17 +00:00
  • 64f6a794fc Updating translations for config/locales/nb.yml [skip ci] Transifex-Openfoodnetwork 2017-01-08 23:36:57 +11:00
  • 764c95488c made api key optional (google maps) elf Pavlik 2017-01-07 09:27:37 -06:00
  • 6cabba4cd8 Merge pull request #1354 from openfoodfoundation/uk/translation Lynne 2017-01-06 10:00:23 +00:00
  • bd1cd527d3 configurable google maps api key elf Pavlik 2017-01-03 20:57:10 -06:00
  • d17f9dc504 update Lynne Davis 2017-01-03 16:35:01 +00:00
  • f62c583130 uk translation updates Lynne Davis 2017-01-03 16:11:56 +00:00
  • b1e27e0dad Auto-merged master into uk/translation on deployment. Maikel 2017-01-04 02:24:40 +11:00
  • 6ae1272281 Mark order cycle form as dirty when removing fees v1.8.7 Levent Ali 2016-10-26 16:59:01 +01:00
  • e0cb6ed60a Merge pull request #1349 from openfoodfoundation/tos Lynne 2016-12-22 18:31:30 +00:00
  • 8aeec74fed Auto-merged master into tos on deployment. Maikel 2016-12-22 23:19:27 +11:00
  • 7cd7e7367b Adding UK TOS to repo Lynne Davis 2016-12-22 12:09:44 +00:00
  • 4f4fe90db4 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-21 15:27:57 +11:00
  • 7a7cd3a937 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-21 14:16:08 +11:00
  • bfc01e7c89 Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-21 11:21:42 +11:00
  • bc5672b5eb Added translation Matt-Yorkley 2016-12-20 13:30:24 +00:00
  • d77f775c4c Moving commits from 1241 to trigger build on UK staging Lynne Davis 2016-12-19 15:06:43 +00:00
  • 7531c8cbc9 Removed dashes Matt-Yorkley 2016-12-19 11:10:12 +00:00
  • 38fe0afc03 Changed p widths Matt-Yorkley 2016-12-17 22:59:29 +00:00
  • 252f876827 Fixed orders closed display for mobile view Matt-Yorkley 2016-12-17 22:54:59 +00:00
  • 6d9bae8ef9 Checkout layout adjustments for mobile view Matt-Yorkley 2016-12-17 20:39:13 +00:00
  • 0b2281dfe2 Adjustment for chrome browser Matt-Yorkley 2016-12-17 16:07:39 +00:00
  • 72cff0688a Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-16 15:24:52 +11:00
  • 9793450ed0 Make mobile menu mimic the large menu Rohan Mitchell 2016-12-16 14:40:13 +11:00
  • c8f0502e71 Apply connect_learn_homepage feature toggle to mobile menu Rohan Mitchell 2016-12-16 14:32:48 +11:00
  • b075ed373a Merge remote-tracking branch 'origin/master' into HEAD Continuous Integration 2016-12-16 13:46:08 +11:00
  • eef308c4f6 create a pr-br translate file (#1266) Rafael Braz 2016-12-14 19:39:37 -02:00
  • 70225afa13 Updating translations for config/locales/fr.yml [skip ci] Transifex-Openfoodnetwork 2016-12-12 05:53:28 +11:00
  • 0a67876815 Update angular-file-uploader-rails to v1.1.6 Matt-Yorkley 2016-12-09 18:47:16 +00:00
  • b59e5ad248 Merge pull request #1243 from openfoodfoundation/uk/translations Lynne 2016-12-09 16:37:38 +00:00
  • 287e0b5b55 Enterprise switcher and navigation check Matt-Yorkley 2016-12-09 15:15:42 +00:00
  • c6a1560845 Auto-merge from CI [skip ci] Continuous Integration 2016-12-10 01:42:26 +11:00
  • 45dc1341d3 translation updates Lynne Davis 2016-12-09 14:41:16 +00:00
  • 7d7197da58 Reordered enterprises submenu Matt-Yorkley 2016-12-09 14:31:34 +00:00
  • 066f42070a Fixed confusing wysiwyg line breaks display discrepency Matt-Yorkley 2016-12-09 14:12:00 +00:00
  • cad3464f56 Adjusted BOM spec to reflect currency symbol changes Lynne Davis 2016-12-09 11:40:55 +00:00
  • bbcaef20a8 Add unit specs for Spree::Admin::NavigationHelper Rohan Mitchell 2016-12-09 11:24:58 +11:00
  • 43726a0b23 Fix inventory link not appearing on menu Rohan Mitchell 2016-12-08 10:38:01 +11:00
  • 6e6efea328 Fix groups link not appearing on menu Rohan Mitchell 2016-12-08 10:27:41 +11:00
  • a2a6ce1b3e Revert "TEMP: Remove override for no-longer-present method" Maikel Linke 2016-11-30 16:53:35 +11:00