raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 19 Branches 454 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

6861 Commits

Author SHA1 Message Date
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
summerscope
6135fe0336 Revert producers list to standard bullet point list 2014-06-13 10:26:09 +10:00
summerscope
567855b13c Adding in new icon for producers modal list 2014-06-12 16:39:35 +10:00
summerscope
f9ded4c616 Markup change for taxon to be spat out correctly in shopfront view 2014-06-12 16:22:54 +10:00
Will Marshall
365c14d4fe Adding smooth scroll to hubses 2014-06-12 16:16:46 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
summerscope
1a4e3c20ad Styling for new svg icons for taxons 2014-06-12 15:47:38 +10:00
Rohan Mitchell
0061caa8df Do not show deleted products in order cycle admin 2014-06-12 14:59:27 +10:00
Rob H
be6a043aac Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 12:58:40 +10:00
Rob H
0b1b260527 Adding dynamic text to display as placeholder 2014-06-12 12:58:39 +10:00
Rob H
7782745663 Add fields for variant display name and display as to bpe 2014-06-12 12:58:39 +10:00
Rob H
1a91b5a728 Move option value naming logic into separate lib class 2014-06-12 12:55:53 +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
349ba112d0 Fixing map issues, adding a nice pretty loader 2014-06-12 11:50:28 +10:00
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
Rohan Mitchell
a6e3dd65fe WIP (tests reqd): Customers and products+inventory reports handle nil order cycle times 2014-06-11 20:39:34 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Rob H
44f4ee822c Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-11 12:41:51 +10:00
Rohan Mitchell
12809438ac Orders and fulfilment report handles order cycles with nil opening or closing times 2014-06-11 10:33:59 +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
Rob H
6e04eeba07 Adding dynamic text to display as placeholder 2014-06-06 15:43:05 +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