Commit Graph

  • f0a2098826 Adding text generation to new business model features Lynne Davis 2016-05-25 09:45:47 +01:00
  • a624a57bfb Pass current order to PaymentMethodSerializer Maikel Linke 2016-05-25 17:12:47 +10:00
  • 0af8377844 Add payment method fees to order during checkout Maikel Linke 2016-05-18 15:40:08 +10:00
  • e4f855b64a Display calculator in payment method edit form Maikel Linke 2016-05-13 11:56:00 +10:00
  • 16b80a2f1b Extend PaymentMethod with calculated_adjustments Maikel Linke 2016-05-11 12:33:14 +10:00
  • 21b8445753 Include job name in failure message Maikel Linke 2016-05-25 11:58:57 +10:00
  • 63432c2acc Resize tested page to find all products Maikel Linke 2016-05-25 11:45:18 +10:00
  • 03f98af60b Merge remote-tracking branch 'origin/master' into uk/spree-google-analytics Maikel Linke 2016-05-25 10:05:09 +10:00
  • 852a12db61 Remove caching of global npm phantomjs install Rob Harrington 2016-05-19 14:49:26 +10:00
  • b804a70469 Columns service updates state of columns (especially id) when data received from server Rob Harrington 2016-05-19 12:44:56 +10:00
  • 924d155012 Using correct syntax for attributes on columns Rob Harrington 2016-05-19 12:43:28 +10:00
  • 604418d699 Install phantomjs with npm Rob Harrington 2016-05-16 09:23:50 +10:00
  • b9f6cb8800 Adding translations for all column names Rob Harrington 2016-05-15 22:59:07 +10:00
  • f2de498d61 Show saved status of column preferences Rob Harrington 2016-05-15 22:57:34 +10:00
  • 55da83d0c0 Removing obsolete BOM controller (replaced by LineItemsCtrl) Rob Harrington 2016-05-16 10:31:07 +10:00
  • 1d8719b474 Default column visibility can be set per user using ColumnPreferences model Rob Harrington 2016-05-04 11:33:14 +10:00
  • 3647b17110 Removing save_screenshot call Rob Harrington 2016-05-13 17:50:49 +10:00
  • 533a94267a Refactoring save-bar Rob Harrington 2016-05-13 17:07:12 +10:00
  • ecb9646ccb Using new syntax for save-bar on customers page Rob Harrington 2016-05-13 16:30:39 +10:00
  • 162b11dcc5 Updating spec to new Jasmine syntax Rob Harrington 2016-05-13 16:30:12 +10:00
  • 93a4f19b40 Hash Navigation works on with Group and Shopping page tabs Rob Harrington 2016-05-13 15:33:23 +10:00
  • 92d8ee1a36 Making sure that hash navigation works with auth tabs Rob Harrington 2016-05-13 15:05:58 +10:00
  • 4b8146dd00 Fixing translation error on final registration page Rob Harrington 2016-05-13 12:35:17 +10:00
  • abc906186e Using ngSrc correctly in frontend Rob Harrington 2016-05-13 12:29:06 +10:00
  • 564c1a3650 Improvements to customers page Rob Harrington 2016-05-13 11:36:51 +10:00
  • c44f9d2537 Making text (and links) within shopfront message more legible Rob Harrington 2016-04-22 10:34:33 +10:00
  • 7e932f091d Use have_current_path rather than current_path.should == Rob Harrington 2016-05-11 15:19:28 +10:00
  • 2c9697ff4e Adding -nc option to wget of PhantomJS, so that we only download it if needed Rob Harrington 2016-05-11 14:30:41 +10:00
  • 6bfe1be045 Update spec looking for matching img src Rob Harrington 2016-05-11 11:39:54 +10:00
  • efaf728737 Upgrading ngTagsInput Rob Harrington 2016-05-11 11:04:39 +10:00
  • ddcfe1535a Making TagRule autocomplete available to models other than Customer Rob Harrington 2016-05-11 10:52:50 +10:00
  • 9e0b97dc9c Upgrading textAngular Rob Harrington 2016-05-05 16:46:07 +10:00
  • 245db8971a Fixing specs broken by faster PhantomJS Rob Harrington 2016-05-05 13:50:58 +10:00
  • 0586a71071 Bumping Poltergeist and Capybara versions Rob Harrington 2016-05-05 12:33:06 +10:00
  • 2146a55c3b Linking to PhantomJS installed on PATH Rob Harrington 2016-05-04 15:28:35 +10:00
  • a0254f30cd Adding package.json with npm dev dependencies for js specs Rob Harrington 2016-05-04 11:10:47 +10:00
  • 7a498362b3 Upgrading AngularJS specs to Jasmine 2 syntax Rob Harrington 2016-05-01 21:10:28 +10:00
  • cfbfe8416f WIP (AngularJS 1.5.5 upgrade): updating npm karma packages for travis Rob Harrington 2016-05-01 21:09:44 +10:00
  • 1b0897d53a Bump to AngularJS to 1.5.5 Rob Harrington 2016-05-01 18:52:13 +10:00
  • 9d1ca6eaca Renaming customers form to prevent conflict with customers array Rob Harrington 2016-05-01 18:49:17 +10:00
  • 39a062e90a WIP (Angular 1.4 Upgrade): Moving controllers for login tabs to prevent multiple directives asking for isolate scope Rob Harrington 2016-05-01 18:29:09 +10:00
  • af5eec7094 WIP (Angular 1.4 Upgrade): Adding filters to ofn-select2 and using on order create/edit UI Rob Harrington 2016-05-01 18:28:25 +10:00
  • 668bffcd84 Bumping AngularJS to 1.4.8 Rob Harrington 2016-04-18 01:47:33 +10:00
  • 02d093f6b6 Loading selectors into product modal to display proprties and taxons Rob Harrington 2016-04-18 01:20:38 +10:00
  • 383f7c57aa Wait for login before visiting CMS Rob Harrington 2016-04-18 01:19:02 +10:00
  • 10133a13f2 Make sure that changes are saved before attempting to click link Rob Harrington 2016-04-18 00:05:37 +10:00
  • 8838a89ecc Don't typecast product and variant on_hand from DOM when it is 'On demand' Rob Harrington 2016-04-17 23:15:11 +10:00
  • cf94d67caf Preventing default submit behaviour for order cycle form submission buttons Rob Harrington 2016-04-17 22:05:41 +10:00
  • 97e53900ad Updating translation to start with a capital letter Rob Harrington 2016-04-17 22:04:33 +10:00
  • 9fc7908af5 Removing '?' to meet expectations of js spec Rob Harrington 2016-04-17 20:59:36 +10:00
  • 7bc118b598 Final steps to remove bindonce Rob Harrington 2016-04-17 20:32:04 +10:00
  • 1d837c32ee Replacing bindonce with native Angularjs syntax in admin Rob Harrington 2016-04-17 20:02:19 +10:00
  • e5ca494db8 Replacing bindonce with native Angularjs syntax in Darkswarm Rob Harrington 2016-04-17 19:28:04 +10:00
  • 5de9eed48a Fixing broken instagram link Rob Harrington 2016-04-17 15:17:42 +10:00
  • fe739f6a8d angular-foundation tabs directive on shop pages is closed by default Rob Harrington 2016-04-17 14:09:37 +10:00
  • 02be661163 Bumping angularjs version to 1.3.15 Rob Harrington 2016-04-17 14:02:28 +10:00
  • 22ae668c74 Diet for images David Leuliette 2016-05-23 19:50:48 +02:00
  • fc69adb135 Fixing producer emails spec Rob Harrington 2016-05-23 10:40:46 +10:00
  • 4e4175ee4c fixed i18n on admin edit groups elf Pavlik 2016-05-22 19:03:34 -05:00
  • aa04da48f3 fixed i18n on admin edit enterprise elf Pavlik 2016-05-22 18:40:42 -05:00
  • a2d875655c Nothing v1.7.1 Rob Harrington 2016-05-20 14:13:10 +10:00
  • 6a610ff7a4 Merge remote-tracking branch 'origin/master' into uk/trial-length Rob Harrington 2016-05-20 12:22:47 +10:00
  • 5d3adc0bdb Fixing producer emails so that they calculate tax correctly Rob Harrington 2016-05-20 11:01:33 +10:00
  • 6a3f6e7bfa Revert "Add line item included_tax_amount method to multiply by quantity" Rob Harrington 2016-05-20 09:46:31 +10:00
  • d043de08cd Revert "Temporarily comment out tax column" Rob Harrington 2016-05-20 09:42:19 +10:00
  • 858beb97c5 Temporarily comment out tax column Steve Pettitt 2016-05-18 08:49:05 +01:00
  • 379bad9f46 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into error-pages Maikel Linke 2016-05-18 15:54:58 +10:00
  • 041d9814a7 Remove redundant CSS and jpg Maikel Linke 2016-05-18 15:54:10 +10:00
  • c66ac0827e Add translations to plain text part Steve Pettitt 2016-05-16 21:35:40 +01:00
  • 419402c554 Add some HTML email specs Steve Pettitt 2016-05-16 21:30:56 +01:00
  • 93f0a7c58d Remove debug statement Steve Pettitt 2016-05-15 23:25:19 +01:00
  • 38316bae3f Add Stroudco wording to en-GB Steve Pettitt 2016-05-15 23:24:59 +01:00
  • bd4debe91b Merge branch 'uk/order_cycle_report' of https://github.com/openfoodfoundation/openfoodnetwork into uk/order_cycle_report Steve Pettitt 2016-05-15 23:13:17 +01:00
  • 08eaff1c24 Formatting changes Steve Pettitt 2016-05-15 23:10:38 +01:00
  • 547fcf49e0 Add line item included_tax_amount method to multiply by quantity Steve Pettitt 2016-05-14 11:00:13 +01:00
  • 3a813cb612 Merge master Steve Pettitt 2016-05-14 10:09:31 +01:00
  • da57e04a50 Merge branch 'fix-groups-map' of https://github.com/bingxie/openfoodnetwork into fix-groups-map Rohan Mitchell 2016-05-13 16:02:22 +10:00
  • ba2d5548ff Fix groups map view Bing Xie 2016-05-13 15:44:34 +10:00
  • a4e5e49a08 Auto-merged master into uk-order-cycle-report on deployment. Maikel 2016-05-13 11:28:15 +10:00
  • 027976626c Add spec for error summing Spree::Money Rohan Mitchell 2016-05-13 11:19:44 +10:00
  • 9f56494c4c Simplify Rohan Mitchell 2016-05-13 10:36:23 +10:00
  • ab37cd2577 Fix specs, need to add new for HTML Steve Pettitt 2016-05-10 23:11:14 +01:00
  • 559f7afc60 HTML order cycle report email, text customisable in translations Steve Pettitt 2016-05-10 23:04:06 +01:00
  • ef418c7f50 Change to use total rather than display_total (which returns a Spree::Money object) Steve Pettitt 2016-05-04 07:58:23 +01:00
  • c80255e9ab Add total to producer emails Steve Pettitt 2016-05-01 12:59:55 +01:00
  • 7b994adc23 Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar Rohan Mitchell 2016-05-13 10:05:39 +10:00
  • f8ec0d316a Save bar can support cancel button Bing Xie 2016-05-12 10:52:48 +10:00
  • 7040e4baae Resize window to fix failed test Bing Xie 2016-05-06 14:55:16 +10:00
  • fed3ae9e85 Make the page long enough to avoid the save bar overlaying the form Bing Xie 2016-05-06 12:43:50 +10:00
  • 89ae77dfd9 Make the save bar look better Bing Xie 2016-05-06 11:00:34 +10:00
  • 7bf6881cb2 Tweaks Bing Xie 2016-05-04 14:48:15 +10:00
  • ed1a06495b Remove unused test code Bing Xie 2016-05-04 12:27:24 +10:00
  • e5d2e5010b Fix failed tests Bing Xie 2016-05-04 12:11:03 +10:00
  • 3760a34b2b Add save_bar to the order cycles simple editing form Bing Xie 2016-05-04 11:22:25 +10:00
  • 26bb1a9beb Update AdminEditOrderCycleCtrl unit tests Bing Xie 2016-05-03 22:58:09 +10:00
  • d59dea29ab Fix failed test for the default form Bing Xie 2016-04-29 15:23:19 +10:00
  • 78b4a35d12 Keep the action with save button Bing Xie 2016-04-29 10:43:28 +10:00
  • 7fc37e4737 Tweak save_bar css Bing Xie 2016-04-27 13:47:04 +10:00
  • 2214c83ec7 Use save_bar on order cycle update form Bing Xie 2016-04-27 12:16:13 +10:00
  • d10719330d Extend save_bar directive to support more buttons Bing Xie 2016-04-27 12:15:20 +10:00