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

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
summerscope
53aaf6bff3 Making input label in shopfront small to distinguish from variant name and price 2014-06-19 14:19:10 +10:00
Will Marshall
d20c952595 fixing issue 750 2014-06-19 14:19:09 +10:00
summerscope
4a053a50ea New animation mixin 2014-06-19 14:19:09 +10:00
summerscope
8c6e0c6b18 Remove SVG styling from this scss - now in taxons.css.sass 2014-06-19 14:19:09 +10:00
summerscope
397d15999f Remove SVG styling from this scss - now in taxons.css.sass 2014-06-19 14:19:09 +10:00
summerscope
f3ca82ec8e New stylesheet to style taxon SVG icons 2014-06-19 14:19:09 +10:00
Will Marshall
ce1732db27 Adding taxon preview (big) to the admin UI 2014-06-19 14:18:52 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +10:00
Will Marshall
9951f668e8 Adding 180x180 size to logo 2014-06-19 13:00:28 +10:00
Will Marshall
36451423ba Producer fat view 2014-06-19 12:56:55 +10:00
Will Marshall
3c7f5e9158 Adding new mechanism to hubs/fat 2014-06-19 12:54:06 +10:00
Will Marshall
b8cc2de91e Merge branch 'master' into laura_and_will 
Conflicts:
	db/schema.rb
 2014-06-19 12:49:58 +10:00
Will Marshall
f1c4ee6744 Fixing up hub modal 2014-06-19 12:49:28 +10:00
Will Marshall
3b4e600599 Changing producer to enterprise 2014-06-19 12:39:35 +10:00
Will Marshall
58e810a736 Using enterprise in modals 2014-06-19 12:38:30 +10:00
Will Marshall
738fdfcd49 Merge branch 'laura_and_will' 2014-06-19 12:11:12 +10:00
Will Marshall
8fcc2b0c62 Merge branch 'refactoring_services' into laura_and_will 2014-06-19 12:10:28 +10:00
Will Marshall
5d71af7687 fixing issue 750 2014-06-19 12:10:26 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
b9561ecf20 Minor refactoring from code review with Rohan 2014-06-19 11:41:24 +10:00
summerscope
47775b13fc Tweak IE old warning css to remove css anims (not supported old browsers anyway) 2014-06-19 11:32:30 +10:00
summerscope
b0b8e14adb Tweak IE old warning message for stakeholder feedback 2014-06-19 11:30:41 +10:00
Rohan Mitchell
2f2e0d41af On customer reports, do not show orders through a hub that the current user does not manage 2014-06-19 10:35:32 +10:00
Rohan Mitchell
3b7fc9f105 Reword spec descriptions 2014-06-19 10:03:05 +10:00
summerscope
710abf96eb Changing Producer modal markup to reflect new design. WIP commit, 2014-06-18 18:53:31 +10:00
summerscope
a62ab98f53 Update images styling to make more generic / modular and remove styling specific to producers to make more scalable. 2014-06-18 18:53:02 +10:00
summerscope
f89418c0d6 Update follow markup to reflect new design WIP commit 2014-06-18 18:52:29 +10:00
summerscope
54983845c4 Update contact markup to reflect new design 2014-06-18 18:52:07 +10:00
summerscope
fcd0096843 Changing markup to Hub modal (map) to reflect new design 2014-06-18 18:50:59 +10:00
summerscope
e924d8d5dc Adding stylesheet to manage modals for Hubs and Producers 2014-06-18 18:50:40 +10:00
Will Marshall
c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-18 17:54:13 +10:00
summerscope
2dcdd997a2 Turn off IE message ready for logic 2014-06-18 17:14:20 +10:00
summerscope
83e7225ef8 Add browser logos for IE message 2014-06-18 17:11:57 +10:00
summerscope
4d6a92dfe4 Update markup to include links to modern browsers for upgrade 2014-06-18 17:11:08 +10:00
summerscope
2acf3bf382 Styling for old IE upgrade / warning message 2014-06-18 17:10:47 +10:00
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Will Marshall
45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-18 15:48:24 +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
c3cec34186 Redirect to enterprises page after updating producer properties 2014-06-18 15:28:41 +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
94c42abf56 Admin can update 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
Rohan Mitchell
92e3546a76 Retrieve properties for a product as a hash 2014-06-18 15:22:03 +10:00
Rohan Mitchell
0139c4bda2 Set producer property 2014-06-18 15:22:03 +10:00
Rohan Mitchell
9d8629f41f Add producer property model 2014-06-18 15:22:02 +10:00
Rob H
6809d70397 Redirect user back to enterprise edit page after saving 2014-06-18 13:18:33 +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