40 Commits

Author	SHA1	Message	Date
Will Marshall	1ed634239d	Major refactoring	2014-06-20 16:31:49 +10:00
Will Marshall	21b6e91913	Moving OFN flash to fixed block	2014-06-10 12:29:31 +10:00
Will Marshall	a87361d82e	Merge branch 'master' into maps ... Conflicts: app/assets/javascripts/darkswarm/services/map.js.coffee app/assets/javascripts/templates/map_modal.html.haml app/views/layouts/darkswarm.html.haml app/views/map/index.html.haml app/views/shared/menu/_large_menu.html.haml config/routes.rb	2014-06-06 17:21:27 +10:00
Will Marshall	92eca72f4f	Fixing a couple of paths and clearing localStorage when changing distributor	2014-06-06 14:04:48 +10:00
Will Marshall	82ab14a33e	Starting on on the map	2014-06-06 14:04:45 +10:00
Will Marshall	d85c89b5d2	Merge branch 'master' into maps	2014-06-05 17:12:40 +10:00
summerscope	2984cada53	Remove Admin link from left menu as this now lives in the drop-down menu for logged in users under Cog icon to right.	2014-06-05 15:51:23 +10:00
Will Marshall	1ab0d6816c	Merge branch 'laura_and_will' into maps	2014-06-05 15:50:53 +10:00
Will Marshall	476eeef69d	Starting on on the map	2014-06-05 12:18:26 +10:00
summerscope	33c276c7f7	Adding in new icon fonts to mobile menu partial	2014-06-04 16:08:16 +10:00
summerscope	122ab01ce4	Adding in new icon fonts to large menu partial	2014-06-04 16:08:02 +10:00
summerscope	498559f70d	Adding in new icon fonts to cart partial	2014-06-04 16:07:41 +10:00
summerscope	fc4e20ffd4	Adding new icons from new pretty icon font	2014-06-03 11:50:38 +10:00
summerscope	8caccfc5b0	Merge laura_and_will into icon_font	2014-05-30 17:01:49 +10:00
Will Marshall	13c6ce6786	Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty	2014-05-30 15:52:20 +10:00
summerscope	45f6a86fd2	Adding new icons to menu partials	2014-05-29 10:19:50 +10:00
Will Marshall	0b595e21d2	Showing admin for enterprise or admin user	2014-05-20 16:05:28 +10:00
Will Marshall	4e463e7087	Showing admin for enterprise or admin user	2014-05-20 15:16:52 +10:00
Will Marshall	685ba3f63a	Fixing my modal and the tests	2014-05-20 12:18:28 +10:00
Will Marshall	e7f6a9badf	Adding data to groups page	2014-05-20 12:18:28 +10:00
summerscope	461d30e006	Tweak stylign to show large menu visibility class for large + up	2014-05-09 15:39:09 +10:00
Will Marshall	c52457505e	Fixing issues with offcanvas	2014-05-09 12:18:05 +10:00
Rohan Mitchell	34c18b522c	Fix incorrect admin path	2014-05-09 08:33:26 +10:00
summerscope	64c94793e4	Menu styling for mobile menu	2014-05-08 16:41:18 +10:00
Will Marshall	4e2326eaa2	Making the offcanvas not position fixed	2014-05-08 13:19:44 +10:00
Will Marshall	50f5a1c46f	Hash toggling	2014-05-08 13:19:44 +10:00
Will Marshall	de369d938f	Starting to work on anchor scrolling	2014-05-08 12:34:16 +10:00
Will Marshall	09f239ddfe	Merging	2014-05-08 12:20:26 +10:00
Will Marshall	ff20837f50	Fixing a path issue	2014-05-08 11:50:57 +10:00
Will Marshall	d5648bd993	Removing some garbage, adding admin link	2014-05-08 11:50:57 +10:00
summerscope	a7ef1295e4	Tweak styles to adjust break point for menu	2014-05-08 11:48:12 +10:00
Will Marshall	eb5dbd0654	Fixing a regression	2014-05-08 11:18:53 +10:00
summerscope	c5376f3862	Reset to head	2014-05-08 11:08:47 +10:00
Will Marshall	6af314a075	Patching unmerged path	2014-05-06 18:31:20 +10:00
Will Marshall	3542799349	Removing pointless foundation crud, reworking the login	2014-05-06 18:28:20 +10:00
summerscope	6cb186ffe3	Styling for footer and further work for top nav	2014-05-06 17:32:22 +10:00
summerscope	93f095d976	Adding a menu style and styling around the new top nav	2014-05-06 16:10:02 +10:00
Will Marshall	1a396429fe	Re-ordering stuff for Laura	2014-05-06 12:27:21 +10:00
Will Marshall	dd25bfd345	Starting to rework menu	2014-05-05 15:52:48 +10:00
Will Marshall	1774bc1e19	Adding producers filtering and more Angular magic	2014-05-05 15:43:11 +10:00