Commit Graph

  • 8d87cfbc35 Move option value naming logic into separate lib class Rob H 2014-06-04 14:54:42 +10:00
  • a99e18990d Readability Rohan Mitchell 2014-06-04 14:27:17 +10:00
  • 1ccfc46e50 Update primary taxons migration - take more care in setting the default primary taxon Rohan Mitchell 2014-06-04 14:27:05 +10:00
  • 29fbf0438b Adding all fields to new admin product spec Rob H 2014-06-04 11:42:42 +10:00
  • 62e8a913fa Merge branch 'laura_and_will' into icon_font summerscope 2014-06-04 11:09:37 +10:00
  • 1a39b70a14 Merge branch 'master' into laura_and_will summerscope 2014-06-04 11:08:44 +10:00
  • d52c1fa5da Revert "Do not show deleted products in order cycle admin" Rohan Mitchell 2014-06-03 12:18:27 +10:00
  • fc4e20ffd4 Adding new icons from new pretty icon font summerscope 2014-06-03 11:50:38 +10:00
  • 037769bfb1 Adding new icons from icon font summerscope 2014-06-03 11:50:17 +10:00
  • a6a86612c7 Adding X from new icon font to modal summerscope 2014-06-03 11:48:11 +10:00
  • d4f65a63bb Remove spec for removed image Rohan Mitchell 2014-06-03 11:31:30 +10:00
  • 4e45a682fd Do not show deleted products in order cycle admin Rohan Mitchell 2014-06-03 11:29:07 +10:00
  • 60711301c1 Initialise primary taxon in migration instead of in model callback Rohan Mitchell 2014-06-03 11:16:42 +10:00
  • 31bab3469e Implementing new X icon for modal window summerscope 2014-06-03 11:20:15 +10:00
  • 653120888f Implementing new X icon for modal window summerscope 2014-06-03 11:20:03 +10:00
  • c07ca67f29 Implementing new X icon for modal window summerscope 2014-06-03 11:19:56 +10:00
  • 73a68799be Implementing new X icon for modal window summerscope 2014-06-03 11:19:45 +10:00
  • d160f4fe51 Implementing new X icon for modal window summerscope 2014-06-03 11:19:37 +10:00
  • cd332c1eb1 Implementing new X icon for modal window summerscope 2014-06-03 11:19:22 +10:00
  • 8a34160713 No change summerscope 2014-06-03 11:18:43 +10:00
  • 8fa053a0a8 Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly. summerscope 2014-06-03 10:28:18 +10:00
  • bcfa1a8266 Fix spec to check validation of missing primary_taxon correctly Rob H 2014-05-30 20:06:40 +10:00
  • f97ef0838c Rollback variant_unit_change check, auto-set primary taxons where they exist Rob H 2014-05-30 19:20:15 +10:00
  • bf4d83aecc Fix master options_text display on front end Rob H 2014-05-30 18:39:41 +10:00
  • 8caccfc5b0 Merge laura_and_will into icon_font summerscope 2014-05-30 17:01:49 +10:00
  • ef5b36cddd Styling producers summerscope 2014-05-30 16:39:07 +10:00
  • 2a8ef182f2 Merge remote-tracking branch 'origin/master' into new-product-form Rob H 2014-05-30 16:38:50 +10:00
  • 1d5cc5dced Adding specs for new product creation Rob H 2014-05-30 16:38:29 +10:00
  • b19ca3b9c4 Remove whitespace summerscope 2014-05-30 16:38:27 +10:00
  • 66a47f053c Amend products controller spec to include requirement for primary_taxon_id Rob H 2014-05-30 16:21:04 +10:00
  • 31ae0cf2a9 Tweak logic on contact us address line display summerscope 2014-05-30 16:14:40 +10:00
  • 5f163eef1c Tweaking the contact thingy Will Marshall 2014-05-30 16:10:28 +10:00
  • ae310ff606 Refactor producers tab content for spacing of string summerscope 2014-05-30 16:02:46 +10:00
  • 587cf1ac9b Tabs styling for hub shopfront page summerscope 2014-05-30 15:54:29 +10:00
  • 06adca7462 Producers tab content styling and layout for hub shopfront page summerscope 2014-05-30 15:54:10 +10:00
  • 9f172af34c Styling and layout for groups tab content summerscope 2014-05-30 15:53:06 +10:00
  • 87d58b639d Styling and layout and content updates to contact hub tab content summerscope 2014-05-30 15:52:46 +10:00
  • 57b895b0c3 Styling and layout for About Hub Name tab content on shopping page summerscope 2014-05-30 15:50:39 +10:00
  • 5c46057bf3 Merge branch 'master' into laura_and_will Will Marshall 2014-05-30 15:53:03 +10:00
  • 13c6ce6786 Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty Will Marshall 2014-05-30 15:52:20 +10:00
  • 4aae6be9b7 Remove unused overrides for primary taxons and product/new Rob H 2014-05-30 15:48:36 +10:00
  • 66d6de9dfc Merge master (with primary taxons restored) Rob H 2014-05-30 15:45:48 +10:00
  • 7abfb2f936 Showing the resizing logo as well Will Marshall 2014-05-30 15:32:47 +10:00
  • 15d8299efb Fix enterprises spec - primary taxons change Rohan Mitchell 2014-05-24 10:34:22 +10:00
  • de9319f002 Auto-aligning BEFORE resizing Will Marshall 2014-05-30 15:23:42 +10:00
  • 69376e7f4b Merge in master Rob H 2014-05-30 15:10:13 +10:00
  • 3ddd7c31e8 Patching which image is rendered Will Marshall 2014-05-30 15:08:16 +10:00
  • be640fd856 Patching a spec and naming something Will Marshall 2014-05-30 15:02:47 +10:00
  • 7304e24591 Switching the image dimensions Will Marshall 2014-05-30 14:47:53 +10:00
  • a7340df6a5 Removing some dud test content Will Marshall 2014-05-30 14:45:27 +10:00
  • 5cbc60e686 Typo fix on food hub modal summerscope 2014-05-30 14:43:31 +10:00
  • 68582514ef Grammar fix up for food hub modal summerscope 2014-05-30 14:41:34 +10:00
  • a979334f2a Adding primary taxon Will Marshall 2014-05-23 16:01:24 +10:00
  • b736145552 Adding primary taxon to admin forms Will Marshall 2014-05-22 16:13:47 +10:00
  • 1c31ac56ea Adding primary taxon field to product Will Marshall 2014-05-22 15:49:10 +10:00
  • 72c50486fa ADding new icons into producer modal summerscope 2014-05-30 14:29:08 +10:00
  • 91224ed0a4 Merge issues. Removing position fixed on modal window styling. summerscope 2014-05-30 12:17:44 +10:00
  • 20873b6e45 Patching a minor regression spec Will Marshall 2014-05-30 14:21:21 +10:00
  • 18597a2377 Patching a minor regression spec Will Marshall 2014-05-30 14:18:51 +10:00
  • 5f6b8c9b5b Merge branch 'laura_and_will' into icon_font summerscope 2014-05-30 13:19:54 +10:00
  • 5bdb38e293 Merge issues. Removing position fixed on modal window styling. summerscope 2014-05-30 12:17:44 +10:00
  • 85ee33517a Restoring another deleted file Will Marshall 2014-05-30 13:19:23 +10:00
  • 42a9f16800 Adding in new icon into producer partial summerscope 2014-05-30 13:08:18 +10:00
  • 49a39bb240 Adding unlock icon to signed in summerscope 2014-05-30 13:06:48 +10:00
  • 179d9f609c Adding in new lock icon to signed in summerscope 2014-05-30 13:05:56 +10:00
  • 2c334a0180 Styling for trash icon on checkout page summerscope 2014-05-30 13:02:34 +10:00
  • 2b0bdc69cd Fixing a scope issue Will Marshall 2014-05-30 13:01:16 +10:00
  • 638d6d2ac0 Moving around the authentication specs Will Marshall 2014-05-30 12:58:58 +10:00
  • 00ac80bdbb Add new icons summerscope 2014-05-30 12:56:56 +10:00
  • 368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL Will Marshall 2014-05-30 12:52:14 +10:00
  • a54b3f7849 Adding new icon for refresh summerscope 2014-05-30 12:39:44 +10:00
  • 9a962f7445 Add new icons to checkout & back to cart buttons summerscope 2014-05-30 12:35:54 +10:00
  • 5a7df20a2e Update icon font for mixins summerscope 2014-05-30 12:32:46 +10:00
  • 589188d21e Update icons for Tabs on hub shopping page summerscope 2014-05-30 12:32:28 +10:00
  • 206c947ea5 Tweaking test Will Marshall 2014-05-30 12:20:18 +10:00
  • 5c44413ae9 Merge branch 'laura_and_will' into icon_font summerscope 2014-05-30 12:18:29 +10:00
  • 10418b6035 Merge issues. Removing position fixed on modal window styling. summerscope 2014-05-30 12:17:44 +10:00
  • 15cde6c372 Merge branch 'laura_and_will' into icon_font summerscope 2014-05-30 12:12:07 +10:00
  • 43cc77c88b Adding icon into button summerscope 2014-05-30 12:01:57 +10:00
  • ee785a3498 Merge branch 'master' into laura_and_will Will Marshall 2014-05-30 12:01:33 +10:00
  • db131af5e7 Patching a class hook Will Marshall 2014-05-30 12:00:28 +10:00
  • 1a47a7486e Automatically closing the accordion if the form is already valid Will Marshall 2014-05-30 11:58:22 +10:00
  • 3fca8640fd Add class right to icons summerscope 2014-05-30 11:57:19 +10:00
  • 9cae581cda Add class right to icons summerscope 2014-05-30 11:57:06 +10:00
  • 34c4fc8aa1 Add class right to icons summerscope 2014-05-30 11:56:52 +10:00
  • 474581211b Add class right to icons summerscope 2014-05-30 11:56:41 +10:00
  • e064aa3173 Restyling labels for new icons in checkout process summerscope 2014-05-30 11:49:32 +10:00
  • cca6a39476 Adding in icons to checkout partial summerscope 2014-05-30 11:49:14 +10:00
  • cbc28f6da7 Adding in icons to checkout partial summerscope 2014-05-30 11:48:59 +10:00
  • b4f14197fa Adding in icons to checkout partial summerscope 2014-05-30 11:48:47 +10:00
  • 4893679d12 Adding in icons to checkout partial summerscope 2014-05-30 11:48:32 +10:00
  • d9f7865572 Can add an image from redesigned new product page Rob H 2014-05-30 11:31:53 +10:00
  • a7a8c3ecee Change icon for bullet point for list style summerscope 2014-05-30 11:30:52 +10:00
  • 0eb4e35ee4 New version of icon font summerscope 2014-05-30 11:30:30 +10:00
  • c9acb14809 Adding primary taxon migration to schema Rob H 2014-05-30 11:30:00 +10:00
  • dd0907addd Adding back the primary taxon migration Will Marshall 2014-05-30 11:24:16 +10:00
  • 5b58bf2c71 Adding our own custom unauthorized page Will Marshall 2014-05-30 10:43:16 +10:00
  • 4c6a7622eb Convert rep template to rabl Rohan Mitchell 2014-05-29 17:18:27 +10:00
  • 7d73f7d7f2 Fix reversed checkbox value for select all variants on order cycle admin page Rohan Mitchell 2014-05-29 16:00:39 +10:00
  • 3ae2dc34e8 Preventing rabl from dying if no current hub Will Marshall 2014-05-29 16:50:41 +10:00