Commit Graph

  • aa8457c40f Fix order serializer spec: change from id to number Steve Pettitt 2016-01-26 19:03:19 +00:00
  • a9c37c162e Update email footer to use instance email and social media contacts Lynne Davis 2016-01-26 13:12:51 +00:00
  • 93de2e4b02 Auto-merged master into delivery_email_updates on deployment. Maikel 2016-01-26 11:01:47 +11:00
  • a0f51af355 Correcting name tag for order conf email Lynne Davis 2016-01-25 23:50:53 +00:00
  • 3dd3cfa7ec Auto-merged master into uk/account-balances on deployment. Maikel 2016-01-25 04:43:25 +11:00
  • 295ee47c3a Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances Steve Pettitt 2016-01-24 17:34:43 +00:00
  • c9a8d7efa5 Message for users with no orders Steve Pettitt 2016-01-22 19:49:03 +00:00
  • 1f1b0bd783 styling groups blurb Maikel Linke 2016-01-22 16:20:07 +11:00
  • d562f6537e Cleaner opengraph meta tags Maikel Linke 2016-01-20 15:42:01 +11:00
  • 1c46b8dccb check_github_status.sh can check for user defined statuses Maikel Linke 2016-01-20 14:58:21 +11:00
  • 8c1a16b371 groups blurb text Maikel Linke 2016-01-20 14:00:46 +11:00
  • ea796d4f94 Taxon filter for group hubs Maikel Linke 2016-01-20 13:31:51 +11:00
  • d5aea1b00d Taxon filter for group producers Maikel Linke 2016-01-20 12:16:13 +11:00
  • fd9de730c8 group producer style adjustment Maikel Linke 2016-01-15 16:01:06 +11:00
  • fbdeb557ca Loading only visible enterprises for group Maikel Linke 2016-01-15 15:37:11 +11:00
  • 07d691fc97 Only apply cart scrolling to non-mobile devices Rohan Mitchell 2016-01-15 16:54:56 +11:00
  • eeb31f65c3 Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment. Maikel 2016-01-15 16:15:09 +11:00
  • 046d0f0d19 Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity Rohan Mitchell 2016-01-15 16:07:25 +11:00
  • a611e73bed Opengraph facebook: images and description for shops and groups and home => ok ludivinecp 2015-12-14 10:07:31 +01:00
  • aea766327c Add say_no and say_yes to locale Maikel Linke 2016-01-10 10:42:33 +11:00
  • f68f7ea2b6 Fix display of "Total" Maikel Linke 2016-01-06 13:50:07 +11:00
  • ddf6eef370 Auto-merged master into ng-vo-inventory-reset on deployment. Maikel 2016-01-15 09:21:54 +11:00
  • 9979e31220 Final tidy up after rebasing default_inventory and ng-vo onto origin/master Rob Harrington 2016-01-13 22:51:40 +11:00
  • 669642292b Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub Rob Harrington 2016-01-13 16:10:25 +11:00
  • ecf1aac5cb Added failure message to VO reset stveep 2015-12-30 17:43:09 -05:00
  • 4103ed0ba7 Combining variant override controller specs Rob Harrington 2015-12-22 12:28:10 +11:00
  • 0bbae19b41 Variant Overrides Index: User can manually reset inheritance Rob Harrington 2015-12-22 11:54:09 +11:00
  • 607a66b6c6 WIP: Fixing a few broken VO specs Rob Harrington 2015-12-21 10:37:30 +11:00
  • a3f7ff19b0 Add new VO fields to shopping spec Steve Pettitt 2015-12-11 09:07:59 +00:00
  • 0f4479aceb Back to original (current master) Rspec version Steve Pettitt 2015-12-11 08:24:35 +00:00
  • 1d38866f86 Add migration file to git repo Steve Pettitt 2015-12-03 21:08:27 +00:00
  • e423e890e0 Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly Steve Pettitt 2015-11-28 20:55:55 +00:00
  • 25454d3e97 Added new fields to fix VO deletion feature specs Steve Pettitt 2015-11-28 18:26:41 +00:00
  • 75127f2a63 Fix feature specs for VO reset Steve Pettitt 2015-11-28 12:49:48 +00:00
  • 94785d4157 Fixing authorization for VariantOverridesController#bulk_reset Rob Harrington 2015-10-29 11:46:56 +11:00
  • d01da727f0 Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead Rob Harrington 2015-10-29 11:12:55 +11:00
  • 5a62098b95 Cleaning up and attempt to add feature spec Steve Pettitt 2015-09-10 23:28:46 +01:00
  • 0ee078e232 Added toggle to enable/disable reset stock. Updated specs Steve Pettitt 2015-08-31 18:02:53 +01:00
  • 2921958788 Variant override controller spec added Steve Pettitt 2015-08-22 16:13:49 +01:00
  • 34c603a9c3 Added angular service tests for variant overrides stock reset Steve Pettitt 2015-08-18 21:35:00 +01:00
  • 6c0dd7e25f Adding 'default_stock' to VariantOverride Steve Pettitt 2015-07-20 08:12:25 +01:00
  • 53d97dab08 WIP: Adding view and routes for resetting variant_overrides count_on_hand Rob Harrington 2016-01-13 19:20:18 +11:00
  • 3b7700131c Specify controller specs as such Rob Harrington 2016-01-13 19:00:25 +11:00
  • 14c8683535 Updating active_model_serializers Rob Harrington 2016-01-13 18:58:38 +11:00
  • e070168c4a Auto-merge from CI [skip ci] Continuous Integration 2016-01-15 03:30:02 +11:00
  • cc4dc068ab Adding variant SKU field to BPE Rob Harrington 2015-12-18 13:47:17 +11:00
  • 64cd52e067 Adding SKU and on demand to a few VO specs Rob Harrington 2015-12-18 12:05:06 +11:00
  • 4553bc2997 Moving SaveBar directive and StatusMessage service into admin.utils module Rob Harrington 2015-12-18 11:29:06 +11:00
  • 521f227f74 Adding sku and on_demand to VariantOverride Rob Harrington 2015-12-18 09:56:56 +11:00
  • cab6871de3 Pulling bulk actions dropdown out into partial Rob Harrington 2015-11-27 08:48:52 +11:00
  • 7cd8f35ac8 Tidying up styling and use of skeleton columns on index pages Rob Harrington 2015-11-27 08:42:26 +11:00
  • 2b70ddb23c Adding columns toggle to variant overrides index Rob Harrington 2015-11-27 08:24:55 +11:00
  • 9eaec6061e Pulling columns dropdown out into a shared partial Rob Harrington 2015-11-27 08:24:29 +11:00
  • 54e7677888 Integrating StatusMessages into save-bar, adding to variant overrides index Rob Harrington 2015-11-26 17:26:56 +11:00
  • c781113a65 Adding filters to variant overrides interface Rob Harrington 2015-11-26 12:51:29 +11:00
  • 4237a83028 Moving components required for variant overrides into appropriate modules Rob Harrington 2015-11-20 11:33:46 +11:00
  • f11e878e7f WIP: Reorganising variant overrides javascript files Rob Harrington 2015-11-20 11:12:33 +11:00
  • 68e2b9a0b9 Auto-merged master into preserve-max-quantity on deployment. Maikel 2016-01-13 16:57:31 +11:00
  • 406338ea05 Remove cruft Rohan Mitchell 2016-01-13 16:44:22 +11:00
  • 2c3ff37980 Split order cycles controller into parts Rohan Mitchell 2016-01-13 16:42:38 +11:00
  • c33835e751 fixup whitespace Maikel Linke 2016-01-13 16:23:14 +11:00
  • 826d045532 Auto-merged master into cart-fit-to-screen on deployment. Maikel 2016-01-13 16:12:41 +11:00
  • c4b0245399 Merge branch 'master' of https://github.com/marito59/openfoodnetwork into marito59-master Maikel Linke 2016-01-13 16:07:21 +11:00
  • 0c434c197b Making Travis fail if karma fails Maikel Linke 2016-01-13 16:07:04 +11:00
  • a07eabca55 Fit cart to screen and allow scrolling so we can always access all of it Rohan Mitchell 2016-01-13 16:00:43 +11:00
  • 1cfb5a7feb Merge branch 'master' of https://github.com/blancnic/openfoodnetwork into blancnic-master Maikel Linke 2016-01-13 15:06:11 +11:00
  • 00af6ef9de cleanup knapsack integration Maikel Linke 2016-01-13 12:11:42 +11:00
  • 7a998663b2 Knapsack report and test splitting Maikel Linke 2016-01-08 19:21:51 +11:00
  • 749061d60a knapsack report generation Maikel Linke 2016-01-08 18:42:03 +11:00
  • 667d1c5428 More reliable spec Steve Pettitt 2016-01-10 16:16:30 +00:00
  • f5db1cd921 Images, first attempt at column formatting Steve Pettitt 2016-01-10 15:53:14 +00:00
  • 770a8d0b17 #771-minor-bug-on-Firefox Nicolas Blanc 2016-01-10 09:54:35 +01:00
  • 262a8e75f9 slugs Steve Pettitt 2016-01-10 07:58:04 +00:00
  • 81b688f0e8 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances stveep 2016-01-07 13:26:13 +00:00
  • 698d36180d Move query from injector to User instance method stveep 2016-01-07 13:25:15 +00:00
  • 46382e669f more verbose example of Discourse config Maikel Linke 2016-01-07 22:44:03 +11:00
  • 217fa9a57c UI integration of Discourse login Maikel Linke 2016-01-07 19:01:09 +11:00
  • 01bf64e6b0 Allow delayed_job to use the locale defined for application Christian 2016-01-07 07:15:18 +01:00
  • 839bf8794f Fix a hard cocded string on Order summary screen Christian 2016-01-07 07:06:26 +01:00
  • 037c524df2 Preserve max quantity when reloading shopfront Rohan Mitchell 2016-01-07 16:35:54 +11:00
  • 71569324f4 Serialise cart updates - do not submit another until the previous has completed Rohan Mitchell 2016-01-07 13:53:37 +11:00
  • 030f4f63ed SingleSignOn controller with routes and config Maikel Linke 2016-01-07 12:23:39 +11:00
  • 257b5a9eef Move premature Spree::Order#update prevention up a level, for even greater efficiency gains Rohan Mitchell 2016-01-07 11:21:25 +11:00
  • ac650ebd46 Add support for mirroring Norway's database Rohan Mitchell 2016-01-07 10:56:56 +11:00
  • e24027a8d0 Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee Rohan Mitchell 2016-01-07 10:52:36 +11:00
  • a27e593924 Fix deprecation notices Rohan Mitchell 2016-01-07 10:51:39 +11:00
  • 09086b8dd8 Reference implementation of SSO from Discourse Maikel Linke 2015-12-18 16:17:58 +11:00
  • 6992d66202 Add payments data, reformat dates stveep 2016-01-01 09:37:21 -05:00
  • 9342ceb968 Adding translation notes to en.yml v1.3.1 Maikel Linke 2015-12-14 18:45:33 +11:00
  • 324f58a636 Updating translations for es.yml, fr.yml and nb.yml Maikel 2015-12-01 17:24:13 +11:00
  • 20b3ad2cd6 Transifex configuration file Maikel Linke 2015-11-26 11:29:24 +11:00
  • 823a6bff5b Use config to get logo in mails Christian 2015-11-08 16:46:44 +01:00
  • 59c51f9e7c Fixing typo in locale: email_payment_method Maikel Linke 2015-12-24 11:09:37 +11:00
  • f9435a3c34 Starting i18n stveep 2015-12-23 14:39:56 +00:00
  • 59adf88cad Feature spec stveep 2015-12-22 22:59:07 +00:00
  • 48896ab3d8 More serializer specs stveep 2015-12-22 15:09:24 +00:00
  • 668c6ff74f Order serializer spec stveep 2015-12-21 23:22:15 +00:00
  • da0810382b Sorting by most orders, currency symbol, hide until clicked, reformatting table headers stveep 2015-12-21 22:19:00 +00:00
  • 90e627ad60 Data manipulation and balance calc in rails instead stveep 2015-12-21 17:40:36 +00:00
  • 7e50cc9ce8 Data organisation in angular, basic table structure and balance calculation. stveep 2015-12-21 14:12:38 +00:00