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
4,200 Commits 21 Branches 450 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

149 Commits

Author SHA1 Message Date
Rafael Schouten
425105174e return space remover 2014-10-16 16:26:50 +11:00
Rafael Schouten
881e82e825 add some angular documentation 2014-10-06 22:59:06 +11:00
Rafael Schouten
01063367c4 clickable show profiles label 2014-10-04 00:59:17 +10:00
summerscope
a6e8d6906f Tweak message on profile label 2014-09-26 11:20:09 +10:00
Rob Harrington
33dff551c7 Removing 'show profiles' from producer and shop pages 2014-09-25 17:19:57 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
summerscope
24ca1b064a Tweak language for help popover 2014-09-18 15:34:56 +10:00
summerscope
0b59ca2dc1 Turning Show Profiles checkbox back on ready for logic 2014-09-18 15:33:44 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +10:00
Rafael Schouten
1aa80e53b1 Merge branch 'master' into currency 
Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb
 2014-09-16 10:25:22 +10:00
summerscope
94165f17e4 Merging master into this branch to keep repository up to date 2014-09-11 16:33:44 +10:00
summerscope
24507c6c0a turn off Profile filter again until ready to support this 2014-09-11 16:29:38 +10:00
summerscope
71918539b8 Undo changing name Hubs to Shops, for the moment 2014-09-11 15:40:35 +10:00
summerscope
997479f5be Change label on mobile menu 2014-09-11 13:05:21 +10:00
Rafael Schouten
0fa4540cec Merge branch 'master' into currency 2014-09-11 12:09:18 +10:00
Rafael Schouten
44e9cf5ade add currency spec file and update some class names 2014-09-10 18:22:33 +10:00
Rohan Mitchell
b49eb8fe03 Hide angular templates on page load 2014-09-10 11:50:30 +10:00
Rafael Schouten
991d0029dd add currency localisation 2014-09-08 00:06:53 +10:00
summerscope
b3f97479d3 Hide profile filter from search for the mo 2014-09-05 16:40:59 +10:00
Rob H
428e4c63d4 Profile hubs don't show up in hubs list 2014-09-05 16:18:25 +10:00
summerscope
b487c9848b Add checkbox for show / hide profiles 2014-09-05 12:15:14 +10:00
summerscope
7d7bf7b1f2 Tweak layout for cart to make it more robust for content and allow for longer product labels 2014-08-07 12:07:35 +10:00
summerscope
581cf442a2 Add ToS as a PDF attachment rather than an external site 2014-08-06 16:24:47 +10:00
summerscope
1ca9c60c84 Tweak label to make a distinction between go straight to checkout and just go to shopping cart review 2014-08-06 13:18:58 +10:00
summerscope
aaae8dce2d Move button out of UL in nesting 2014-08-06 12:57:44 +10:00
summerscope
2c95f00485 Adding T&Cs into footer link 2014-08-06 12:02:10 +10:00
Rohan Mitchell
a1dd5dabac Replace sleep with wait, add cart_dirty spec helper 2014-07-31 11:36:53 +10:00
Will Marshall
39a79869c0 Disabling buttons and some work on the price breakdowns, including commenting them out for now 2014-07-29 11:33:25 +10:00
summerscope
5a8fb4670f Cart styling updates 2014-07-25 16:41:50 +10:00
summerscope
c799d8b387 Make filter button turquoise 2014-07-24 17:41:48 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
Will Marshall
d7ff1cd4af Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-24 10:39:36 +10:00
summerscope
7718cf0c48 Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things 2014-07-23 15:35:44 +10:00
Will Marshall
a480353158 Working bindings 2014-07-18 16:05:58 +10:00
Will Marshall
b25def810c Working version of the cart integration 2014-07-18 14:56:15 +10:00
Will Marshall
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +10:00
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