Commit Graph

  • 55d0b1dfc5 Generalize sorting through SortOptions service Kristina Lim 2018-07-19 03:36:57 +08:00
  • 8b6b694244 Remove unused sorting preferences in ColumnsCtrl Kristina Lim 2018-07-06 17:26:54 +08:00
  • 2bba72c5a9 Fix frontend sorting in "Bulk Order Management" Kristina Lim 2018-07-06 17:26:02 +08:00
  • 822b2c929a Fix frontend sorting in "Customers" index Kristina Lim 2018-07-05 18:15:33 +08:00
  • 9f09861d8b Change sorting to be done in ascending order first Kristina Lim 2018-07-08 17:32:16 +08:00
  • 745390dcd5 Wrap rows in customer index with TBODY tag Kristina Lim 2018-07-08 16:40:43 +08:00
  • 12838ba61e Merge pull request #2468 from mkllnk/improve-testing-embedded-pages Maikel 2018-07-23 08:59:11 +10:00
  • add250b30f Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid Maikel 2018-07-23 08:54:01 +10:00
  • df29d4d611 Merge pull request #2472 from lilwillifo/logo-sizing-to-css Maikel 2018-07-23 08:47:45 +10:00
  • 7d790a7d59 Update .rubocop_todo.yml Pau Perez 2018-07-20 18:58:37 +02:00
  • 514fc0a781 Remove dependency to Dash and Jirafe Hugo Daniel 2018-07-20 13:01:13 +02:00
  • 44fe3de732 Make CodeClimate config more strict Pau Perez 2018-07-20 09:08:03 +02:00
  • 5f4115fbd9 Remove unused gem newrelic-rpm Maikel Linke 2018-07-20 16:56:12 +10:00
  • 512e974672 move width setting for tagline logo image from HTML to CSS Margaret Williford 2018-07-14 19:43:43 -06:00
  • d952276e2a move footer logo sizing from html to css Margaret Williford 2018-07-14 16:18:30 -06:00
  • 23964b2542 Merge pull request #2422 from luisramos0/1667_email_validation_fix Maikel 2018-07-20 12:19:23 +10:00
  • 1b571e9835 Merge pull request #2379 from Matt-Yorkley/uk/guest_label Maikel 2018-07-20 08:53:26 +10:00
  • 962c54b606 Remove unnecessary expectation Maikel Linke 2018-07-19 10:45:33 +10:00
  • 8a3a617870 DRY specs with new EmbeddedPagesHelper Maikel Linke 2018-07-19 10:44:43 +10:00
  • 8246893652 Added notice for unexpected mail in confirmation instructions mail (HugsDaniel) luisramos0 2018-07-02 14:40:47 +01:00
  • 1dbd265b30 Merge pull request #2384 from luisramos0/open_new_tab v1.17.0 Maikel 2018-07-19 09:17:09 +10:00
  • e3162b0a14 Change import method to fix missing variable error on asset precompilation Matt-Yorkley 2018-07-16 17:19:09 +01:00
  • 456e05d5d2 Include subfolders in scss import Matt-Yorkley 2018-07-07 19:04:08 +01:00
  • 24ff5555be Create admin SCSS colour palette Matt-Yorkley 2018-06-27 16:55:36 +01:00
  • 75e52a7a91 CSS tweaks fo guest flag Matt-Yorkley 2018-06-16 15:15:16 +01:00
  • 583f16b38d Add guest label to admin customers index Matt-Yorkley 2018-06-14 15:46:21 +01:00
  • 4fe1e1fc9f Merge pull request #2482 from Matt-Yorkley/uk/mail_config Pau Pérez Fabregat 2018-07-18 19:20:55 +02:00
  • 4f215da735 Merge pull request #2467 from mkllnk/ci-output-test Pau Pérez Fabregat 2018-07-18 19:19:40 +02:00
  • 37e2d76a39 Merge pull request #2477 from mkllnk/2465-use-right-subscriptions-translation Pau Pérez Fabregat 2018-07-18 16:47:35 +02:00
  • fac8e26d8b Merge pull request #2475 from Matt-Yorkley/pi/landing_page Pau Pérez Fabregat 2018-07-18 16:47:17 +02:00
  • 23cbcda0c3 Allow preferred_mails_from and preferred_mail_bcc to be set from configs Matt-Yorkley 2018-07-18 14:40:46 +01:00
  • 5e142205bd Use relative translation keys Matt-Yorkley 2018-07-18 13:35:23 +01:00
  • 5737c9803d Add unit_type field to inventory template Matt-Yorkley 2018-07-18 12:59:52 +01:00
  • c7deae4253 Remove category field from inventory specs Matt-Yorkley 2018-07-18 12:49:20 +01:00
  • b37bea35fa Use relative translation keys Matt-Yorkley 2018-07-18 11:43:31 +01:00
  • 18206c9369 Remove old view file Matt-Yorkley 2018-07-18 11:42:07 +01:00
  • 8ae5d5f52e Merge pull request #2415 from oeoeaio/update-readme Pau Pérez Fabregat 2018-07-18 11:19:33 +02:00
  • d56698e4a6 Merge branch 'master' into update-readme Pau Pérez Fabregat 2018-07-18 10:59:20 +02:00
  • 7bf27ec6b3 Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors Pau Pérez Fabregat 2018-07-18 10:38:19 +02:00
  • bd05af5a29 Merge pull request #2442 from kristinalim/translations-enterprise_relationships_to_enterprise_permissions Pau Pérez Fabregat 2018-07-17 14:48:08 +02:00
  • c16f4203f9 Rename enterprise "Relationships" to "Permissions" Kristina Lim 2018-07-09 14:50:05 +08:00
  • 0fd57ee7bd Merge pull request #2390 from luisramos0/buk_prod_edit_rounding_issue Pau Pérez Fabregat 2018-07-16 16:44:59 +02:00
  • 4a44454210 fixed number rounding issue in product bulk edit luisramos0 2018-06-19 15:04:58 +01:00
  • 4d68723fe3 Reference existing translation: closed order cycle Maikel Linke 2018-07-16 09:24:32 +10:00
  • c4af50e95c Add sidebar to Import index page Matt-Yorkley 2018-07-15 21:26:17 +01:00
  • 632b991952 Add downloadable templates Matt-Yorkley 2018-07-15 21:25:42 +01:00
  • f344b7893d Remove Product Import guide page Matt-Yorkley 2018-07-15 20:48:12 +01:00
  • 8aed78b0e6 Don't allow save if invalid entries are present Matt-Yorkley 2018-07-15 10:21:36 +01:00
  • a4210a1cab PI post-save UI changes Matt-Yorkley 2018-07-15 00:14:29 +01:00
  • da344adbcd Merge pull request #2466 from kristinalim/doc-notes_about_i18n_in_contributing Pau Pérez Fabregat 2018-07-13 19:43:52 +02:00
  • c2d9b094d3 Merge pull request #2419 from frank-west-iii/issue-2412-duplicate-menu Pau Pérez Fabregat 2018-07-13 19:43:07 +02:00
  • 622517501c Make spec robust on slow computers Maikel Linke 2018-07-13 19:06:09 +10:00
  • e3b7e050a0 Remove spree product navigation override Frank West 2018-06-29 06:46:30 -07:00
  • 8e90488117 Use progress formatter on Travis to avoid timeout Maikel Linke 2018-07-13 16:21:28 +10:00
  • 599f1a966b Use embedded shops example for tests Maikel Linke 2018-07-12 17:11:21 +10:00
  • 4ebcf4e3c3 Add internationalisation info to CONTRIBUTING.md Kristina Lim 2018-07-13 13:58:32 +08:00
  • 66980b247a Fix test of opening shops in new windows Maikel Linke 2018-07-12 16:35:27 +10:00
  • 6f737d8d1e Unclutter spec setup Maikel Linke 2018-07-12 16:01:19 +10:00
  • ed747ec612 Use embedded groups example for tests Maikel Linke 2018-07-12 15:54:29 +10:00
  • 185cf9a312 Remove code duplication Maikel Linke 2018-07-12 15:42:47 +10:00
  • dfb510debe admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched luisramos0 2018-06-28 23:17:42 +01:00
  • d5d1eae715 Improve spec description Maikel Linke 2018-06-29 09:37:44 +10:00
  • 43883d1ab4 Simplify email confirmation directive Maikel Linke 2018-06-20 14:40:48 +10:00
  • fbe2f7ab4c Remove unused variable from mailer Maikel Linke 2018-06-08 17:52:59 +10:00
  • a531135804 Remove unused data-hooks Maikel Linke 2018-06-08 15:17:15 +10:00
  • e37213f6a5 Remove redundant edit action Maikel Linke 2018-06-08 15:14:26 +10:00
  • 28c2ad7160 Move override into view Maikel Linke 2018-06-08 15:13:01 +10:00
  • a347837044 Move override into view Maikel Linke 2018-06-08 15:08:32 +10:00
  • ab9975cb6c Move override into view Maikel Linke 2018-06-08 15:04:33 +10:00
  • 339b04a044 Convert spree admin user list to haml Maikel Linke 2018-06-08 15:00:55 +10:00
  • 9020e7ddd9 Import admin user list from Spree Maikel Linke 2018-06-07 18:11:52 +10:00
  • 60b66540df Add resend email button to admin user form Maikel Linke 2018-06-07 18:09:35 +10:00
  • 6a58deb436 Add message about unconfirmed email to user form Maikel Linke 2018-06-07 15:01:41 +10:00
  • 8157897f76 Remove unused data hooks Maikel Linke 2018-06-07 14:36:31 +10:00
  • 9050a52cc2 Move admin user form override into view Maikel Linke 2018-06-07 14:35:12 +10:00
  • 2032ed6328 Convert admin user edit form to haml Maikel Linke 2018-06-07 14:29:26 +10:00
  • cb1dc6e657 Import admin user edit form from spree_auth_devise Maikel Linke 2018-06-07 14:25:46 +10:00
  • 23dd09a8fa Convert Spree view from erb to haml Maikel Linke 2018-06-07 14:17:53 +10:00
  • 652cc6e677 Import admin user edit view from spree_auth_devise Maikel Linke 2018-06-07 14:08:15 +10:00
  • 97d1b5d7fe Add spec for creating users Maikel Linke 2018-06-15 16:43:22 +10:00
  • b65578fdc5 Merge pull request #2408 from mkllnk/cleanup-route Maikel 2018-07-13 09:01:33 +10:00
  • 0bd40f498a Merge pull request #2447 from mkllnk/update-translation-documentation Maikel 2018-07-12 10:07:39 +10:00
  • 86f2d7a344 Remove impossible route Maikel Linke 2018-06-26 07:31:21 +10:00
  • b302a1d03d added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations) luisramos0 2018-06-14 16:43:53 +01:00
  • 8cec9d5723 Merge pull request #2451 from Matt-Yorkley/pr_categories Pau Pérez Fabregat 2018-07-11 22:40:52 +02:00
  • 056df62359 Add changelog category to PR template Matt-Yorkley 2018-07-11 18:02:29 +01:00
  • 79b86a4885 Merge pull request #2448 from kristinalim/fix-broken_great_pr_link_in_contributing v1.16.0 Pau Pérez Fabregat 2018-07-11 13:19:17 +02:00
  • 5508c6741f Fix broken "great-pr" link in CONTRIBUTING.md Kristina Lim 2018-07-11 14:10:05 +08:00
  • 24f77184cf Move i18n locale doc to wiki and reference that Maikel Linke 2018-07-11 11:31:27 +10:00
  • 2334f0854c Less invasive modifying the checkout state machine Maikel Linke 2018-07-11 10:55:12 +10:00
  • deb04c3075 Merge pull request #2444 from openfoodfoundation/transifex Pau Pérez Fabregat 2018-07-10 12:12:05 +02:00
  • 459057a7db Revert accidental copy and paste Maikel Linke 2018-07-10 10:31:51 +10:00
  • 26c23887e2 Merge pull request #2276 from oeoeaio/subs-use-default-card Maikel 2018-07-10 10:22:58 +10:00
  • f9a3338755 Simplify serialiser with delegate Maikel Linke 2018-07-10 10:01:18 +10:00
  • b478ef9fd0 Make admin serialiser specs runnable on their own Maikel Linke 2018-07-10 09:59:00 +10:00
  • 15db5e1d50 Updating translations for config/locales/en_GB.yml Transifex-Openfoodnetwork 2018-07-09 20:23:01 +10:00
  • 3dacd06b6b Reload order before sending emails to ensure state is up to date Rob Harrington 2018-06-28 18:56:13 +10:00
  • 0afa9fae8e Check authorisation before attempting to charge credit cards on order cycle close Rob Harrington 2018-06-28 17:56:58 +10:00
  • 4fd333bbaf Remove obsolete reference to credit_card from subscription serializer Rob Harrington 2018-06-25 15:31:59 +10:00
  • a902af42a3 Update attribute that errors are added to from credit_card to payment_method Rob Harrington 2018-06-25 15:30:20 +10:00