raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-18 04:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 15 Branches 457 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

61 Commits

Author SHA1 Message Date
Rohan Mitchell
02d68c662b Add titles to all darkswarm pages 2015-06-16 15:31:35 +10:00
Rohan Mitchell
b540f645c3 Split CSS to overcome IE9's 4096 rule limit 2015-06-16 11:57:50 +10:00
Rohan Mitchell
686a54c121 Make 'selling food' alert visible, basic styling 2015-06-10 19:03:25 +10:00
Rohan Mitchell
610a4c03fe Merge branch 'master' into redesign 
Conflicts:
	app/controllers/home_controller.rb
	app/views/producers/index.html.haml
	app/views/shared/menu/_mobile_menu.html.haml
	app/views/shop/products/_form.html.haml
	config/routes.rb
	spec/controllers/shops_controller_spec.rb
 2015-06-10 18:27:50 +10:00
Continuous Integration
1d08ae89da Auto-merge from CI [skip ci] 2015-05-28 14:31:25 +10:00
Rohan Mitchell
4a59c85b3e Inject current hub from AMS rather than RABL 2015-05-27 15:44:01 +10:00
Rohan Mitchell
c8f14f1ee9 Fetch fonts through https, fixes mixed-security error that prevents fonts loading 2015-05-26 10:29:20 +10:00
Rohan Mitchell
b86872095a Add google analytics 2015-05-13 14:52:17 +10:00
summerscope
330d23c606 Move alert for 'join now' off global template onto homepage template only. 2015-05-02 15:23:12 +10:00
summerscope
53e2bc823d WIP styling and content for homepage 
> footer
> alert @ top
> call to action buttons
 2015-05-01 18:19:51 +10:00
summerscope
e1beae98ab WIP on redesign / layout job 
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
 2015-05-01 14:41:48 +10:00
summerscope
427f535026 Redesign big chunk of work: 
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
 2015-04-30 18:20:17 +10:00
Rob Harrington
06f10398da Adding product property filter to shop page 2015-03-06 11:22:52 +11:00
Rafael Schouten
dc266e066f another few class names 2014-09-10 19:43:14 +10:00
Rafael Schouten
991d0029dd add currency localisation 2014-09-08 00:06:53 +10:00
Will Marshall
606981dee9 Merge branch 'maps' 2014-07-29 15:32:23 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Will Marshall
ea357b54ab Adding some map searching capabilities 2014-07-16 11:19:16 +10:00
Will Marshall
487b8616c0 Adding dereferencing to taxons and reducing our data-set 2014-07-04 13:51:22 +10:00
Will Marshall
ed6bb2275a Fixing some regressions in tests, switching favicons 2014-06-26 15:04:32 +10:00
Will Marshall
a49fe2bf65 Fixing a regression bug 2014-06-25 16:30:23 +10:00
Will Marshall
a4d12c4515 Patching up IE warning 2014-06-19 15:18:14 +10:00
summerscope
b0b8e14adb Tweak IE old warning message for stakeholder feedback 2014-06-19 11:30:41 +10:00
summerscope
2dcdd997a2 Turn off IE message ready for logic 2014-06-18 17:14:20 +10:00
summerscope
4d6a92dfe4 Update markup to include links to modern browsers for upgrade 2014-06-18 17:11:08 +10:00
Will Marshall
9bbfc0a393 Starting a set of small functional changes 2014-06-17 12:35:03 +10:00
Will Marshall
74b3c026d2 Merging in maps 2014-06-10 14:54:12 +10:00
Will Marshall
75f1bf4f54 Merging in master 2014-06-10 14:53:49 +10:00
Will Marshall
373f698676 Adding loading infrastructure 2014-06-10 14:52:27 +10:00
Will Marshall
21b6e91913 Moving OFN flash to fixed block 2014-06-10 12:29:31 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
c09ffa832c Fixing gmaps 2014-06-06 14:04:47 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
Will Marshall
6c68937230 Fixing gmaps 2014-06-05 17:16:19 +10:00
Will Marshall
476eeef69d Starting on on the map 2014-06-05 12:18:26 +10:00
Will Marshall
3c21ce8d99 Returning to the basic flash for now 2014-06-04 17:13:19 +10:00
Will Marshall
cd09f70ed3 Compacting down our flash messages 2014-06-04 17:13:19 +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
Will Marshall
272cb0469f Setting up after_login redirects 2014-05-22 12:40:46 +10:00
summerscope
9886166750 Add in script for google font Open Sans 2014-05-14 15:55:18 +10:00
Will Marshall
c52457505e Fixing issues with offcanvas 2014-05-09 12:18:05 +10:00
Will Marshall
de369d938f Starting to work on anchor scrolling 2014-05-08 12:34:16 +10:00
Will Marshall
dd25bfd345 Starting to rework menu 2014-05-05 15:52:48 +10:00
Will Marshall
28230f0436 Adding a current user service, refactoring various consequences of this change: 2014-04-25 16:59:46 +10:00
Will Marshall
2212156f00 Adding handling of 'current hub' 2014-04-25 11:32:02 +10:00
Will Marshall
8b7d2641f9 Starting to prettify with Laura 2014-04-22 15:46:14 +10:00
Will Marshall
c6395a686a Adding flash notifications 2014-04-17 15:08:01 +10:00
Will Marshall
e1465352d0 Improving the navigation by moving it all to a service, adding a generic icon 2014-03-28 16:02:31 +11:00