Commit Graph

  • e26a61c31f Adding back sanitize Will Marshall 2014-05-29 16:49:20 +10:00
  • c0cb9857cc Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this. summerscope 2014-05-29 16:42:05 +10:00
  • aaf9b76507 Making toggling of fat nodes work Will Marshall 2014-05-29 16:38:01 +10:00
  • d5a652182e Scrolling to groups when hotlinked Will Marshall 2014-05-29 16:31:12 +10:00
  • c49d9d838c Removing reference to modals and unnecessary ID Will Marshall 2014-05-29 16:19:20 +10:00
  • f28fe34958 Removing groups modals Will Marshall 2014-05-29 16:15:39 +10:00
  • e44853346e Dropping current producers, switching to suppliers and using Angular Will Marshall 2014-05-29 16:12:58 +10:00
  • 06bac3de85 Fixing an incorrect sentence case Will Marshall 2014-05-29 15:45:56 +10:00
  • 65d11ce552 Removing some unnecessary Will Marshall 2014-05-29 15:41:27 +10:00
  • 2c1ca15393 Some tweaks to visual stuff Will Marshall 2014-05-29 15:37:19 +10:00
  • 9b10a2cb94 Added 'Add Another' link to new product page. Altered redirects Rob H 2014-05-29 12:13:55 +10:00
  • e110677b3b WIP: Rearrange new product form Rob H 2014-05-29 12:11:06 +10:00
  • c81631118d Add styling to include the search icon in big input searches for Hubs and Producers summerscope 2014-05-29 12:00:16 +10:00
  • 4f1c7345c5 Add search icon into search input on producers page summerscope 2014-05-29 11:59:55 +10:00
  • 86dee82acb Add search icon into search input on hubs summerscope 2014-05-29 11:59:28 +10:00
  • b757629bfa Minor test tweaks Will Marshall 2014-05-29 11:52:46 +10:00
  • 39358247fd Kill whitespace around icon summerscope 2014-05-29 11:47:06 +10:00
  • 74211cbfc7 Merge branch 'master' into fixing_modals Will Marshall 2014-05-29 11:14:16 +10:00
  • 68ab24b790 Add links into footer summerscope 2014-05-29 11:10:45 +10:00
  • b8eb43f8db Add groups icon to modal summerscope 2014-05-29 11:08:35 +10:00
  • 81f51e734c Add groups icon to listings on page summerscope 2014-05-29 11:07:43 +10:00
  • 1248eaeed7 Add producers icon to modal summerscope 2014-05-29 11:05:28 +10:00
  • ff1c5a13e7 Add producers icon to active table summerscope 2014-05-29 11:01:49 +10:00
  • 8f7bab4ab7 Add hub icon to active table summerscope 2014-05-29 10:54:27 +10:00
  • fdff442ec6 Do not fetch products JSON on every shopping page Rohan Mitchell 2014-05-29 10:54:08 +10:00
  • 4971e2305f Add hub icon to modal summerscope 2014-05-29 10:54:07 +10:00
  • 45f6a86fd2 Adding new icons to menu partials summerscope 2014-05-29 10:19:50 +10:00
  • 2a630a855a Move primary taxon field into Rob's new product form Rohan Mitchell 2014-05-29 09:28:08 +10:00
  • 614b25c446 Applying new icon font to footer partial on homepage summerscope 2014-05-28 17:06:52 +10:00
  • 3f36a3785b Adding in icon for list style from new OFN icon font summerscope 2014-05-28 17:06:34 +10:00
  • 6ea7988f4e New version fonts summerscope 2014-05-28 17:06:06 +10:00
  • 09ce8697af Only trigger taxon search AJAX when column visible - fixes deadlocks in specs Rohan Mitchell 2014-05-28 16:55:04 +10:00
  • d3802e9f83 Applying new icon font to map partial on homepage summerscope 2014-05-28 16:43:06 +10:00
  • 4c832b6ae9 Applying new icon font to producers partial on homepage summerscope 2014-05-28 16:39:26 +10:00
  • 7185aa6ab6 Applying new icon font to groups partial on homepage summerscope 2014-05-28 16:38:01 +10:00
  • 8954caf3e0 Applying new icon font to active table on homepage summerscope 2014-05-28 16:33:01 +10:00
  • 0c2a7ac247 Adding style sheet to allow access to custom font summerscope 2014-05-28 16:32:37 +10:00
  • 1e0aec0267 Adding in font files for custom font summerscope 2014-05-28 16:32:10 +10:00
  • 4b1f409774 Only rendering images that exist{ Will Marshall 2014-05-28 16:19:10 +10:00
  • 98b4fe27f6 Hiding group logo if not present Will Marshall 2014-05-28 16:12:13 +10:00
  • fcfda13a73 Patching a couple of minor regressions Will Marshall 2014-05-28 16:10:28 +10:00
  • 5eb54d1ac3 Merge branch 'groups_page' into fixing_modals Will Marshall 2014-05-28 16:04:55 +10:00
  • 33829d9044 Only rendering images if they exist Will Marshall 2014-05-28 16:03:21 +10:00
  • 9bb059493e Fixing the image render Will Marshall 2014-05-28 16:03:05 +10:00
  • b8cc9d3343 Modding image sizing on groups Will Marshall 2014-05-28 16:02:54 +10:00
  • f65ff5af18 Automatically sorting out image rotation Will Marshall 2014-05-28 16:01:36 +10:00
  • a7105fc3a8 Tweaking image sizing on enterprise Will Marshall 2014-05-28 16:01:19 +10:00
  • 50c7bd55be Adding url strip and re-construction of http Will Marshall 2014-05-28 15:06:01 +10:00
  • 0c8ee2488b Moving back to ng-bind-html Will Marshall 2014-05-28 14:58:53 +10:00
  • c26462db57 Addin some URL stripping Will Marshall 2014-05-28 13:25:45 +10:00
  • 576f10dbc3 Adding ng-if checks Will Marshall 2014-05-28 12:58:23 +10:00
  • 1af82bd4fb Forcing scope to parent scope so we don't child our child Will Marshall 2014-05-28 12:58:06 +10:00
  • 1a79b966e9 Adding in links to homepage buttons for Groups & Producers summerscope 2014-05-28 12:21:25 +10:00
  • 3c3409bc1f Tweaks to styling on groups page summerscope 2014-05-27 18:03:12 +10:00
  • 9fe4bef7df Adding groups icon into background for visual consistency summerscope 2014-05-27 17:55:51 +10:00
  • 2130470eaf Styling for groups page summerscope 2014-05-27 17:11:42 +10:00
  • cc2498bb9b Fix spec fails - group buy and available on removed from new product form Rohan Mitchell 2014-05-24 18:26:02 +10:00
  • 403e957111 Further removal of references to 'Admin' from global namespace Rohan Mitchell 2014-05-24 11:14:14 +10:00
  • e951f80070 Merge branch 'new-product-form' Rohan Mitchell 2014-05-24 17:14:32 +10:00
  • 9c1528607a Merge branch 'user-import-export' Rohan Mitchell 2014-05-24 17:13:34 +10:00
  • acbe49b8de Revert primary taxons Rohan Mitchell 2014-05-24 17:11:36 +10:00
  • e6461ba01e Fix enterprises spec - primary taxons change Rohan Mitchell 2014-05-24 10:34:22 +10:00
  • 2db63540ee Adding primary taxon Will Marshall 2014-05-23 16:01:24 +10:00
  • 0a8f5d91ba Adding primary taxon to admin forms Will Marshall 2014-05-22 16:13:47 +10:00
  • 17f09d1852 Adding primary taxon field to product Will Marshall 2014-05-22 15:49:10 +10:00
  • e119192cf1 Manually revert merge commit "Hack patching the modals" Rohan Mitchell 2014-05-24 09:21:48 +10:00
  • 223caa046c Revert "Producers modal styling and markup" Rohan Mitchell 2014-05-24 09:15:22 +10:00
  • 69e0e71eb6 Revert "Styling for shop page product modal" Rohan Mitchell 2014-05-24 09:12:24 +10:00
  • bb1b7cfa90 Revert "Adding fields to product supplier" Rohan Mitchell 2014-05-24 09:07:58 +10:00
  • ad1f852bdd Revert "Adding primary taxon field to product" Rohan Mitchell 2014-05-24 09:07:57 +10:00
  • 79393476b0 Revert "Adding primary taxon to admin forms" Rohan Mitchell 2014-05-24 09:07:56 +10:00
  • 7ac33beb65 Revert "Adding primary taxon" Rohan Mitchell 2014-05-24 09:07:55 +10:00
  • a7566e3413 Revert "Always showing social media" Rohan Mitchell 2014-05-24 09:07:52 +10:00
  • 4a9a1029a1 Fixed a typo Rob H 2014-05-23 22:33:59 +10:00
  • 14611896c0 Simplify new product form Rob H 2014-05-23 18:08:29 +10:00
  • d1028cb912 User import/export includes addresses Rohan Mitchell 2014-05-23 17:51:02 +10:00
  • 9aadc9d1ce Add initial user import/export via CSV Rohan Mitchell 2014-05-23 15:10:21 +10:00
  • 2987ca763d Add additional data sanitisation for foreign key migration Rohan Mitchell 2014-05-23 15:09:08 +10:00
  • aa23b03f98 Always showing social media Will Marshall 2014-05-23 17:29:18 +10:00
  • fb7b9a051a Hack patching the modals Will Marshall 2014-05-23 17:04:33 +10:00
  • 40f116783c Merge branch 'new_shop' Will Marshall 2014-05-23 16:02:20 +10:00
  • 58112fb105 Adding primary taxon Will Marshall 2014-05-23 16:01:24 +10:00
  • 110a6f2d14 Adding primary taxon to admin forms Will Marshall 2014-05-22 16:13:47 +10:00
  • fd1e7ebaa3 Adding primary taxon field to product Will Marshall 2014-05-22 15:49:10 +10:00
  • 6d24a6555e Adding fields to product supplier Will Marshall 2014-05-22 14:47:10 +10:00
  • 84b6f99321 Styling for shop page product modal summerscope 2014-05-22 14:40:35 +10:00
  • 9e46108e9a Enterprise user can only add order cycle exchanges where it manages the participant enterprise Rohan Mitchell 2014-05-23 12:18:22 +10:00
  • 14dee8d7fe OrderCycleFormApplicator requires permitted_enterprises to be set explicitly Rohan Mitchell 2014-05-23 12:09:38 +10:00
  • 095b9bf67a Enterprise user can only update order cycle exchanges where it manages the participant enterprise Rohan Mitchell 2014-05-23 12:05:46 +10:00
  • 9b15c213d1 When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges Rohan Mitchell 2014-05-23 11:22:04 +10:00
  • e85c144e87 Remove reference to 'Admin' from global namespace Rob H 2014-05-23 11:22:12 +10:00
  • 4657285769 Producers modal styling and markup summerscope 2014-05-22 16:35:48 +10:00
  • 47f6d32055 Make list items the same height Rob H 2014-05-22 15:47:50 +10:00
  • f8776fecff Move enterprises dashboard controller Rob H 2014-05-22 15:46:26 +10:00
  • 371240652c Change 'Overview' menu item to 'Dashboard' Rob H 2014-05-22 15:30:11 +10:00
  • ed3c23cd90 Split 'My Enterprises' dashboard item into Hubs and Producers Rob H 2014-05-22 15:28:25 +10:00
  • 1a7c6f87ed Adding fields to product supplier Will Marshall 2014-05-22 14:47:10 +10:00
  • d7bc1a9b95 Styling for shop page product modal summerscope 2014-05-22 14:40:35 +10:00
  • 015403c282 Merge branch 'new_shop' Will Marshall 2014-05-22 12:40:48 +10:00
  • d1b27edefe Reworking the JS specs Will Marshall 2014-05-21 16:54:48 +10:00