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
12,629 Commits 17 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

3834 Commits

Author SHA1 Message Date
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Rohan Mitchell
cf4e7b18b4 Redirect to enterprises index page after updating producer properties 2014-06-18 15:43:22 +10:00
Will Marshall
deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-18 15:40:02 +10:00
Rohan Mitchell
e6674d43fa Admin can reorder producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
27fa93dbb4 Admin can remove producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
84cd56cfdc Admin can list and create producer properties 2014-06-18 15:28:41 +10:00
Will Marshall
e7c301da83 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-18 13:05:44 +10:00
Rob H
65a0e4707a Add text which explains cropping of promo image 2014-06-18 12:58:32 +10:00
Rob H
3884b0cc1b Adding a direct link to shopfront to enterprise edit page for distributor enterprises 2014-06-18 12:37:26 +10:00
Rob H
45b16d52dd Add visible checkbox to enterprises index page to allow bulk editing of visibility 2014-06-18 11:44:47 +10:00
Rob H
2e749ef1f3 Move admin enterprises index to haml 2014-06-18 11:08:00 +10:00
Rob H
0611947306 Merge branch 'master' into sm-makeover 2014-06-18 10:39:40 +10:00
Rob H
004548a4fe Rearrange shipping method edit page 2014-06-18 10:21:21 +10:00
Will Marshall
f54834da01 Changing our composition of producers and hubs 2014-06-17 16:33:43 +10:00
Will Marshall
37fee5c316 Reworking the empties cart and active table link stuff 2014-06-17 16:33:31 +10:00
Will Marshall
57c5c2d411 Changing icon markup 2014-06-17 14:34:38 +10:00
Will Marshall
9bbfc0a393 Starting a set of small functional changes 2014-06-17 12:35:03 +10:00
Will Marshall
e697a544e5 Merge branch 'master' into laura_and_will 2014-06-17 11:45:04 +10:00
summerscope
80f26c7457 Tweak label until shipping methods are available 2014-06-17 10:50:47 +10:00
summerscope
5f155df42a Making input label in shopfront small to distinguish from variant name and price 2014-06-13 14:32:06 +10:00
Will Marshall
17682dbc58 fixing issue 750 2014-06-13 14:31:55 +10:00
Will Marshall
3aa9501480 Adding main app 2014-06-13 14:13:16 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
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