raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,825 Commits 17 Branches 453 Tags
4e6f07de8a6a44934ad0e480d334ef0f2b53fa61
Commit Graph

1189 Commits

Author SHA1 Message Date
Rohan Mitchell
4e6f07de8a WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times 2014-06-12 11:49:55 +10:00
Rob H
d9a5b02415 Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 11:49:54 +10:00
Rohan Mitchell
908f7871bb Orders and fulfilment report handles order cycles with nil opening or closing times 2014-06-12 11:49:54 +10:00
Rob H
5f8ed01475 Adding dynamic text to display as placeholder 2014-06-12 11:49:54 +10:00
Rob H
f688461e84 Add fields for variant display name and display as to bpe 2014-06-12 11:49:53 +10:00
summerscope
860360d81e Change map container name to remove ofn- which refers to icon font styling 2014-06-12 11:34:01 +10:00
Will Marshall
82da4d3911 Fixing the taxon icons to support le svgs 2014-06-10 15:52:27 +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
e806ffdd1a Merge branch 'maps' 2014-06-10 11:17:14 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
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
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +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
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
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
summerscope
8a87e5e545 Add in link to map page for homepage pane 2014-06-06 10:03:51 +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
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
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
Will Marshall
476eeef69d Starting on on the map 2014-06-05 12:18:26 +10:00
Rohan Mitchell
566afc0b75 Merge branch 'laura_and_will' 2014-06-05 11:42:02 +10:00
Rohan Mitchell
4a7609a835 Basic styling for checkout credit card form 2014-06-05 11:17:53 +10:00
Will Marshall
fc02e7857a Merge branch 'master' into laura_and_will 
Conflicts:
	app/views/shopping_shared/_contact.html.haml
 2014-06-04 17:24:30 +10:00
summerscope
039108a07d Styling label on taxons on fat view of active table for hubs (add a little padding to right) 2014-06-04 17:16:47 +10:00
Will Marshall
3c21ce8d99 Returning to the basic flash for now 2014-06-04 17:13:19 +10:00