raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 21 Branches 450 Tags
0785509bc4e1b486019ff40ca853c6ca3e50ebfe
Commit Graph

601 Commits

Author SHA1 Message Date
Will Marshall
ba842be5b8 Loading enterprises per-view again 2014-06-20 12:03:51 +10:00
Will Marshall
17521516b4 Patching up some regressions with the tabs 2014-06-20 11:33:30 +10:00
summerscope
a362c2591f Remove parentheses from address on button 2014-06-20 10:42:52 +10:00
summerscope
e4f4db82da Tweak markup for producer modal 2014-06-20 09:58:49 +10:00
summerscope
6d20b16c3c Tweak markup for map modal 2014-06-20 09:58:32 +10:00
summerscope
6a350e4867 Tweak order of classes 2014-06-19 17:07:16 +10:00
summerscope
591441b968 Making a js change to remove hub name from shipping method label 2014-06-19 16:31:11 +10:00
summerscope
3747306c31 Styling for producer modal on map 2014-06-19 16:30:36 +10:00
summerscope
c50426328e Styling for hub modal on map 2014-06-19 16:30:22 +10:00
summerscope
4c160ac83f Changing markup for CONTACT section of enterprise modal 2014-06-19 15:42:35 +10:00
summerscope
b68d038dd0 Markup adjustments for producer modal on map view - styling all the things! making things dynamic to show and hide 2014-06-19 15:42:35 +10:00
summerscope
a74766909a Adding a stylesheet specifically for enterprises e.g. hubs and producers 2014-06-19 15:42:34 +10:00
Will Marshall
a4d12c4515 Patching up IE warning 2014-06-19 15:18:14 +10:00
Will Marshall
24f147d81d Adding pickup and delivery 2014-06-19 14:38:05 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +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
8fcc2b0c62 Merge branch 'refactoring_services' into laura_and_will 2014-06-19 12:10:28 +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
710abf96eb Changing Producer modal markup to reflect new design. WIP commit, 2014-06-18 18:53:31 +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
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
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Will Marshall
45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-18 15:48:24 +10:00
Will Marshall
deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-18 15:40:02 +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
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
9bbfc0a393 Starting a set of small functional changes 2014-06-17 12:35:03 +10:00
Will Marshall
17682dbc58 fixing issue 750 2014-06-13 14:31:55 +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
415a4eff0a Not pre-loading images and setting the map back to gifses 2014-06-13 11:05:32 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
Will Marshall
365c14d4fe Adding smooth scroll to hubses 2014-06-12 16:16:46 +10:00
Will Marshall
f6690cb8dd Patching a minor bug in cart emptying 2014-06-12 16:13:52 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
Rohan Mitchell
88c41df201 BPE uses soft-delete for products 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
Will Marshall
349ba112d0 Fixing map issues, adding a nice pretty loader 2014-06-12 11:50:28 +10:00
Will Marshall
48e2c3512f Patching a minor bug in cart emptying 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
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
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