Commit Graph

  • 272cb0469f Setting up after_login redirects Will Marshall 2014-05-21 16:39:59 +10:00
  • 0140472fbc Adding working modals Will Marshall 2014-05-21 14:09:48 +10:00
  • d6512a78d4 Removing position fixed Will Marshall 2014-05-22 12:39:52 +10:00
  • c69a4a5f1a Adding social media links Will Marshall 2014-05-22 12:12:10 +10:00
  • 70f549e92a Patching our modified admin login Will Marshall 2014-05-22 11:46:06 +10:00
  • 34c31afabe Adding large image Will Marshall 2014-05-22 11:34:46 +10:00
  • a16f726377 Extract have_relationship test Rohan Mitchell 2014-05-22 11:32:37 +10:00
  • c2f762d570 Enterprise user can only see relationships involving their enterprises Rohan Mitchell 2014-05-22 11:27:19 +10:00
  • d7b4318aff Find enterprise relationships involving any of a number of enterprises Rohan Mitchell 2014-05-22 11:25:37 +10:00
  • 06955a024f Enterprise user can only create relationships with their own enterprises as parent Rohan Mitchell 2014-05-22 11:02:03 +10:00
  • fb05ad57e1 Tidy up spec helper, clean database before suite run Rohan Mitchell 2014-05-22 11:00:29 +10:00
  • 66cd5c937f Add a helper to make capybara specs fail fast Rohan Mitchell 2014-05-22 10:59:41 +10:00
  • f6bc1a82be Enterprise user can manage enterprise relationships Rohan Mitchell 2014-05-22 10:54:51 +10:00
  • 12dfcd0de9 Fixing auth workflowsg Will Marshall 2014-05-22 10:43:26 +10:00
  • 250b76ec79 Merge branch 'master' into new_shop Will Marshall 2014-05-22 10:43:02 +10:00
  • f997026796 Reworking the JS specs Will Marshall 2014-05-21 16:54:48 +10:00
  • 67e72f4504 Setting up after_login redirects Will Marshall 2014-05-21 16:39:59 +10:00
  • 2d0a42b2c2 Adding working modals Will Marshall 2014-05-21 14:09:48 +10:00
  • 48a7b9c3f8 Fix specs from 'X permits Y' table format change Rohan Mitchell 2014-05-22 08:50:52 +10:00
  • d8fa30ea6f Add a sequence to option type position, prevents inconsistent ordering in specs Rohan Mitchell 2014-05-21 16:54:26 +10:00
  • a049266732 Replace enterprise relationship parent/child concepts with 'X permits Y' Rohan Mitchell 2014-05-21 16:28:27 +10:00
  • 0c647841a6 Add dynamic filter to enterprise relationships Rohan Mitchell 2014-05-21 16:18:07 +10:00
  • 76d1754c32 Reorder helper method at bottom Rohan Mitchell 2014-05-21 15:11:14 +10:00
  • 92292c853d Extract partials from enterprise relationships admin page Rohan Mitchell 2014-05-21 15:03:29 +10:00
  • 3bf21d42dd WIP: removing all payment methods from enterprise edit page Rob H 2014-05-21 15:02:59 +10:00
  • 6026a74c73 Table matcher have_table_row does not wait for full duration on should_not Rohan Mitchell 2014-05-21 14:59:24 +10:00
  • 18886c931f Extract create EnterpriseRelationship to service Rohan Mitchell 2014-05-16 15:04:14 +10:00
  • 5d0680234d Admin can delete enterprise relationships Rohan Mitchell 2014-05-16 14:44:01 +10:00
  • aa965e3752 Show a CSS3 animation when a row is added Rohan Mitchell 2014-05-16 11:34:10 +10:00
  • f1df021091 Show enterprise relationships tab as selected Rohan Mitchell 2014-05-16 11:28:13 +10:00
  • b9a9937541 Attempting to create a relationship with invalid data shows an error message Rohan Mitchell 2014-05-16 11:27:59 +10:00
  • e40843bccb Allow error messages without attribute name. Improve enterprise relationship error message. Rohan Mitchell 2014-05-16 11:25:51 +10:00
  • 9b2a80c6b5 Admin can create enterprise relationships Rohan Mitchell 2014-05-15 16:23:04 +10:00
  • 3cb55062cc Split enterprise_relationships rabl into show and index Rohan Mitchell 2014-05-15 16:20:25 +10:00
  • ba7e29074f have_table_row waits Rohan Mitchell 2014-05-15 16:20:02 +10:00
  • 5f4e4ebeb0 Admin can list enterprise relationships Rohan Mitchell 2014-05-15 14:49:39 +10:00
  • 61af8204d9 Add spec matcher have_table_row Rohan Mitchell 2014-05-15 14:49:25 +10:00
  • 6414ae2972 Output enterprise relationships as JSON Rohan Mitchell 2014-05-15 14:47:53 +10:00
  • 1a854b89ec Sort enterprise relationships by enterprise name Rohan Mitchell 2014-05-15 14:24:35 +10:00
  • f7de504d89 Add stub angular controller for managing enterprise relationships Rohan Mitchell 2014-05-15 12:27:58 +10:00
  • aa53d82386 Add stub page for managing enterprise relationships Rohan Mitchell 2014-05-15 12:19:48 +10:00
  • 4f1b8d06e7 Construct enterprise relationships with a factory Rohan Mitchell 2014-05-15 12:19:07 +10:00
  • 391b1da04c adding session token to order test Will Marshall 2014-05-21 10:46:03 +10:00
  • d874855aa1 Update styling on empty cart summerscope 2014-05-20 16:40:23 +10:00
  • c1a55de40e Merge branch 'new_shop' Will Marshall 2014-05-20 16:09:31 +10:00
  • ef91f8d17f Redirecting if cart is empty and activating the empty cart link Will Marshall 2014-05-20 16:04:53 +10:00
  • 36aba8049f Starting to rework login behaviour when hitting /admin Will Marshall 2014-05-20 15:47:00 +10:00
  • da69167b4c Putting error messages on checkout into error flash for easier debugging Will Marshall 2014-05-20 12:39:22 +10:00
  • 0b595e21d2 Showing admin for enterprise or admin user Will Marshall 2014-05-20 12:30:28 +10:00
  • 601281ced7 Add button style to shop page summerscope 2014-05-20 16:04:26 +10:00
  • 0957edee5d Styling for shopping cart page summerscope 2014-05-20 15:50:03 +10:00
  • 03de82eb3c Merge branch 'new_shop' Will Marshall 2014-05-20 15:47:32 +10:00
  • df82627bd1 Starting to rework login behaviour when hitting /admin Will Marshall 2014-05-20 15:47:00 +10:00
  • 2fc45d635d Putting error messages on checkout into error flash for easier debugging Will Marshall 2014-05-20 12:39:22 +10:00
  • 4e463e7087 Showing admin for enterprise or admin user Will Marshall 2014-05-20 12:30:28 +10:00
  • 52345d9bb3 Improvements to shoptfront page styling summerscope 2014-05-20 14:11:41 +10:00
  • 3eb6f98c70 Putting error messages on checkout into error flash for easier debugging Will Marshall 2014-05-20 12:39:22 +10:00
  • 9557d69f71 Showing admin for enterprise or admin user Will Marshall 2014-05-20 12:30:28 +10:00
  • 685ba3f63a Fixing my modal and the tests Will Marshall 2014-05-20 12:17:56 +10:00
  • e7f6a9badf Adding data to groups page Will Marshall 2014-05-20 10:47:09 +10:00
  • 61cf35a5b9 Adding attr_accessors and paperclip file uploads Will Marshall 2014-05-16 16:30:37 +10:00
  • 0958602418 Starting on migrations and admin forms Will Marshall 2014-05-16 15:43:26 +10:00
  • 4e4667c33d Adding groups Will Marshall 2014-05-16 11:26:40 +10:00
  • 1dd9f6326b Tweaking the markup and styling for shop page. summerscope 2014-05-16 15:59:53 +10:00
  • 2b414d99e1 Revert content_for changes Rob H 2014-05-16 15:12:47 +10:00
  • eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura Will Marshall 2014-05-16 14:00:33 +10:00
  • 03139cd2de Use existing sidebar content_for Rob H 2014-05-16 11:42:40 +10:00
  • 6979644af7 Fiddle with colors and scrolling in admin enterpise sidebar Rob H 2014-05-16 11:28:02 +10:00
  • 3e22e55b61 Printing taxon icons on home Will Marshall 2014-05-15 16:17:12 +10:00
  • 7c213a061b Getting working taxon sorting and icon rendering in Will Marshall 2014-05-15 16:10:54 +10:00
  • 91fe8e18d3 Taxon sorting Will Marshall 2014-05-15 15:38:10 +10:00
  • 3ac9c3e00d Basics of producer modal in place Will Marshall 2014-05-15 14:01:31 +10:00
  • adb134743f Adding producer modals to home Will Marshall 2014-05-15 12:20:42 +10:00
  • c9fea79d19 Printing the primary taxon name Will Marshall 2014-05-14 16:22:25 +10:00
  • 9f169e6ef8 Adding a basic stub of the primary taxon Will Marshall 2014-05-14 16:15:18 +10:00
  • 8c6e884563 Further improvements, fixing my directive, re-arranging partial Will Marshall 2014-05-13 16:29:43 +10:00
  • 12ddbb6a32 Reworking the shop page Will Marshall 2014-05-13 15:54:14 +10:00
  • 3ce196e042 Starting on the new shop Will Marshall 2014-05-13 12:16:43 +10:00
  • 924128098b Restricting shipping methods Will Marshall 2014-05-15 16:27:49 +10:00
  • dafa89a2cc Add placeholder for ACN and ABN Rob H 2014-05-16 10:07:30 +10:00
  • 19aa79fc27 Add max height to admin sidebar items Rob H 2014-05-16 10:06:20 +10:00
  • 93dedb690d Change overview controller to class_eval Rob H 2014-05-16 10:03:35 +10:00
  • d17a316387 remove naughty pry Rob H 2014-05-15 22:43:08 +10:00
  • fd6f4d04df Merge branch 'master' into ent-makeover Rob H 2014-05-15 17:05:05 +10:00
  • c1c92d62e4 Adjust admin enterprise edit to improve scanning Rob H 2014-05-15 17:03:47 +10:00
  • da95df5ab3 patching one dud spec Will Marshall 2014-05-15 15:41:01 +10:00
  • 7cdfb4bab2 Add methods and fees to sidebar on enterprise edit page Rob H 2014-05-15 14:52:19 +10:00
  • c0ba560fa6 Moving empties cart to a magic directive Will Marshall 2014-05-15 14:47:16 +10:00
  • eae12da24a Adding distributors display to producers page Will Marshall 2014-05-15 12:20:17 +10:00
  • 575ce9fe01 Adding producers to home and distributors to producers Will Marshall 2014-05-15 12:02:58 +10:00
  • 234d4de7ed Forcing everything to be SSL Will Marshall 2014-05-14 15:26:00 +10:00
  • ffd7f3c134 Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff. summerscope 2014-05-09 17:09:59 +10:00
  • dd89dad5b6 Add new font into buttons summerscope 2014-05-09 16:50:03 +10:00
  • 8238cbe0ee Merge changes summerscope 2014-05-09 16:49:49 +10:00
  • d462f34e75 Refactor friday - tidying up and commenting css summerscope 2014-05-09 16:42:31 +10:00
  • 9886166750 Add in script for google font Open Sans summerscope 2014-05-09 16:42:11 +10:00
  • a2205d3f93 Make order cycles spec consistent Rohan Mitchell 2014-05-14 15:50:13 +10:00
  • 6c5172c567 Add EnterpriseRelationship. An Enterprise can find its relatives. Rohan Mitchell 2014-05-14 15:47:37 +10:00
  • 5f712a8984 Removing code Will Marshall 2014-05-14 15:16:29 +10:00
  • 151702d685 Catching order cycle expiry and redirecting Will Marshall 2014-05-14 11:51:25 +10:00