raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,291 Commits 21 Branches 450 Tags
75a59eb5ccdf1be448dbebc86c2b2861baa687d0
Commit Graph

112 Commits

Author SHA1 Message Date
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
Will Marshall
8296a4131e Partializing filter controls 2014-07-10 12:07:21 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
Will Marshall
a4d12c4515 Patching up IE warning 2014-06-19 15:18:14 +10:00
summerscope
176735544b Changing class name to remove ofn- from naming convention which call the icon font styling 2014-06-12 12:12:25 +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
68311ca699 Remove Facebook icon which appeared here - unnecessary. 2014-06-05 15:53:23 +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
8d24301c26 Changing shop link to correct /shop 2014-06-04 16:57:21 +10:00
summerscope
814ee9847e Adding a new partial for mobile menu (off canvas) to restyle items in dropdown in big menu 2014-06-04 16:09:15 +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
6e4de586a9 Adding in new icon fonts to signed out partial 2014-06-04 16:07:17 +10:00
summerscope
1e3c046368 Adding in new icon fonts to signed in partial 2014-06-04 16:07:02 +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
49a39bb240 Adding unlock icon to signed in 2014-05-30 13:06:48 +10:00
summerscope
179d9f609c Adding in new lock icon to signed in 2014-05-30 13:05:56 +10:00
summerscope
15cde6c372 Merge branch 'laura_and_will' into icon_font 
Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml
 2014-05-30 12:12:07 +10:00
Will Marshall
5b58bf2c71 Adding our own custom unauthorized page 2014-05-30 11:24:37 +10:00
summerscope
68ab24b790 Add links into footer 2014-05-29 11:10:45 +10:00
summerscope
45f6a86fd2 Adding new icons to menu partials 2014-05-29 10:19:50 +10:00
summerscope
614b25c446 Applying new icon font to footer partial on homepage 2014-05-28 17:06:52 +10:00
Will Marshall
272cb0469f Setting up after_login redirects 2014-05-22 12:40:46 +10:00
Will Marshall
67e72f4504 Setting up after_login redirects 2014-05-22 10:42:44 +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
7bf969ca1b Removing empty containers and adding classes for padding required 2014-05-09 16:27:28 +10:00
summerscope
76d3fa902f Rejigging footer columns for responsive styling 2014-05-09 15:46:35 +10:00
summerscope
461d30e006 Tweak stylign to show large menu visibility class for large + up 2014-05-09 15:39:09 +10:00
summerscope
f89667ffe4 Refactor content in footer, add in link for creative commons, only thing missing is T&Cs! 2014-05-09 14:34:41 +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
summerscope
967f2827bf Make label consistent for Log in 2014-05-08 12:57:04 +10:00
summerscope
df87c9d715 Adding in github link to footer 2014-05-08 12:55:02 +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