raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 19 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Marshall
7953ff145c Fixing a merge issue 2014-06-06 17:23:28 +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
Rohan Mitchell
f068cb3cd7 Show shipping method via angular only (don't show spree's adjustment) 2014-06-06 17:05:50 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
6c5b514b9b Rescoping the accordion as well 2014-06-06 16:53:09 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
37f197205f Removing shipping method from order when emptied 2014-06-06 16:39:53 +10:00
Rob H
6e04eeba07 Adding dynamic text to display as placeholder 2014-06-06 15:43:05 +10:00
Will Marshall
0c313c0dcb Defaulting cart count to zero if undefined 2014-06-06 14:47:12 +10:00
Will Marshall
2545b06b2d Adding first and last name read-only fields to credit card 2014-06-06 14:28:33 +10:00
Will Marshall
57102f714e Switching to ng-if so CC fields aren't validated when hidden 2014-06-06 14:04:48 +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
c32776c6b8 Disabling maps in production 2014-06-06 14:04:47 +10:00
Will Marshall
54cdc545a4 adding distributor id to localStorage 2014-06-06 14:04:47 +10:00
Will Marshall
afabda788e Adding the close 2014-06-06 14:04:47 +10:00
Will Marshall
74b9810d22 Removing image from about us 2014-06-06 14:04:47 +10:00
Will Marshall
c09ffa832c Fixing gmaps 2014-06-06 14:04:47 +10:00
Will Marshall
ebe40d3b3d New icon 2014-06-06 14:04:46 +10:00
Will Marshall
f881197a74 New icons and some more enterprise data 2014-06-06 14:04:46 +10:00
Will Marshall
ddb5150e77 Automatically resizing to fit 2014-06-06 14:04:46 +10:00
Will Marshall
6f2e841100 Adding modals for the map 2014-06-06 14:04:46 +10:00
Will Marshall
c9c1b4709b Basic but hacky way to get events out of map 2014-06-06 14:04:46 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
summerscope
0c501b58a5 Adjust layout for 12 column grid for Hub details and order cycle info plus adjust CSS to allow for different break points 2014-06-06 11:19:15 +10:00
Rob H
43c5c37326 Add fields for variant display name and display as to bpe 2014-06-06 10:10:41 +10:00
summerscope
8a87e5e545 Add in link to map page for homepage pane 2014-06-06 10:03:51 +10:00
Rohan Mitchell
634af96a66 Update reports controller spec for multi-order-cycle params 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1d44cbf506 Show distribution charge on report 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1a7b32d1ff Show hub and customer name on total row 2014-06-06 09:47:16 +10:00
Rohan Mitchell
673293f273 Add extra shipping columns 2014-06-06 09:47:16 +10:00
Rohan Mitchell
13e2da42eb Add producer column, remove Packed? and Shipped? columns 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1fab8c1e01 In orders and fulfilment reports, rename distributor -> hub and supplier -> producer 2014-06-06 09:47:16 +10:00
Rohan Mitchell
e5f0818065 Order and fulfilment reports can filter by multiple hubs, producers and order cycles 2014-06-06 09:47:16 +10:00
Rohan Mitchell
f8fa014796 LineItem.supplied_by_any 2014-06-06 09:47:15 +10:00
Rohan Mitchell
590ac6aa6d Put orders and fulfilment report in grid layout 2014-06-06 09:47:15 +10:00
Will Marshall
6c68937230 Fixing gmaps 2014-06-05 17:16:19 +10:00
Will Marshall
c75da1ce0d New icon 2014-06-05 17:14:11 +10:00
Will Marshall
d85c89b5d2 Merge branch 'master' into maps 2014-06-05 17:12:40 +10:00
Will Marshall
8b1c2b1e9e New icons and some more enterprise data 2014-06-05 17:12:38 +10:00
Will Marshall
b1b80a1e39 Automatically resizing to fit 2014-06-05 16:49:01 +10:00
Will Marshall
5ffb8decf5 Adding modals for the map 2014-06-05 16:23:43 +10:00
summerscope
3ae1eb863d Update behaviour on Place Order Now button so it is disabled but not hidden when unavailable 2014-06-05 16:20:14 +10:00
summerscope
7b1756fc98 Fix column layout issue for checkout page making content expand beyond page boundaries 2014-06-05 16:19:35 +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
843ea9faef Basic but hacky way to get events out of map 2014-06-05 15:08:50 +10:00
Rohan Mitchell
05c62634fc Further overlapping elements fixes 2014-06-05 14:49:41 +10:00
Rohan Mitchell
2bedc431e8 Fix spec fragility - overlapping elements error 2014-06-05 13:43:41 +10:00
Rob H
1eac76fbba Change variant name to display name 2014-06-05 13:39:53 +10:00