raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-14 23:47:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 19 Branches 453 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

4200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Marshall
9667b84c5c Finishing the transition to AMS from RABL 2014-06-26 11:07:53 +10:00
Will Marshall
8baf32f926 Merge branch 'master' into enterprise-json-perf 2014-06-25 16:31:16 +10:00
Will Marshall
a49fe2bf65 Fixing a regression bug 2014-06-25 16:30:23 +10:00
summerscope
881c229855 Prevents turquoise color text on red button 2014-06-25 15:21:37 +10:00
Will Marshall
33b5359a16 Spiking AMS implementation of data 2014-06-25 15:18:13 +10:00
Will Marshall
9cb6987645 Refactoring the supplied_taxons query to use SQL 2014-06-25 15:18:00 +10:00
Will Marshall
b1f275dac8 Adding enterprises to cart to prevent errors being thrown 2014-06-25 14:38:16 +10:00
Rohan Mitchell
3687479c22 Fetch distributed_taxons in SQL 2014-06-25 14:33:19 +10:00
summerscope
e14470ad77 Fix placeholder text to reference Producer rather than Hub 2014-06-25 14:16:42 +10:00
Will Marshall
2c6e239962 Adding some basic animations, upgrading Angular Foundation 2014-06-25 13:59:22 +10:00
Will Marshall
5f242f9232 Fixing groups page anchor scrolling 2014-06-25 10:46:32 +10:00
Will Marshall
edd9d93b8c Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
	app/views/shopping_shared/_contact.html.haml
	spec/features/consumer/home_spec.rb
 2014-06-24 17:16:22 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
369761ccc5 Minor regression bug 2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380 Tab fixes, new tests, reworking modals 2014-06-24 17:15:31 +10:00
Will Marshall
b3f0cb1e74 Bunch of minor bugfixes 2014-06-24 17:14:01 +10:00
summerscope
31529f0343 Make text links turquoise color for producers page 2014-06-24 16:58:01 +10:00
summerscope
ff344533d9 Remove link for follow links on CONTACT for shopfront mini menu (tabs) - should be icon only 2014-06-24 16:51:58 +10:00
Will Marshall
64cca8cf36 Enabling map on production 2014-06-24 16:01:06 +10:00
summerscope
44d9104200 New favicon for staging and production versions of site 2014-06-24 15:47:27 +10:00
Will Marshall
a9ce36d402 Minor regression bug 2014-06-24 14:15:15 +10:00
Will Marshall
c0ac3c1b14 Tab fixes, new tests, reworking modals 2014-06-24 14:09:21 +10:00
Will Marshall
5c220ca30f Merge branch 'master' into laura_and_will 2014-06-24 14:08:57 +10:00
Will Marshall
11872931a5 Bunch of minor bugfixes 2014-06-24 14:08:13 +10:00
summerscope
563e605ad0 Tweak styling for text message on shopfront 2014-06-24 13:58:59 +10:00
summerscope
a93a1a07cf Tweak styling for closed shoptfront 2014-06-24 13:50:18 +10:00
summerscope
a36408e2a1 Tweak overflow for modal ABOUT styling so that browser never tries to add a horizontal scroll bar 2014-06-24 13:35:00 +10:00
summerscope
d0b2f73c5a Tweak markup for PRODUCERS tab on mini menu 2014-06-24 13:25:45 +10:00
summerscope
e0f5f51f92 Tweak markup for GROUPS tab on mini menu 2014-06-24 13:25:27 +10:00
summerscope
902d896218 Tweak markup for CONTACT tab on mini menu 2014-06-24 13:25:13 +10:00
summerscope
703ee5e566 Tweak markup for ABOUT tab on mini menu 2014-06-24 13:24:56 +10:00
summerscope
a498ffb5a7 Add styles to improve the mini menu / tabs area of the shopfront and make it more consistent 2014-06-24 13:24:33 +10:00
summerscope
e8bf2da69c Tweak small hero image styling 2014-06-24 13:24:11 +10:00
Will Marshall
f7ba8cade0 Bunch of minor bugfixes 2014-06-24 13:01:51 +10:00
Rob H
9099fca11c Merge branch 'bug-herd' into working 2014-06-23 22:01:41 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Rob H
753a867142 'Back to Products List' on product edit page returns user to BPE 2014-06-23 15:54:53 +10:00
Rob H
7d1acc23ad Cancel button on new product form redirects to BPE 2014-06-23 15:54:14 +10:00
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +10:00
Rob H
a21c2c20f7 Change 'Spree' in admin page title to 'OFN' 2014-06-23 11:26:46 +10:00
Rob H
c56e0dfdae Add Laura to Readme 2014-06-23 10:52:23 +10:00
Rob H
3b0bf9c677 Amend readme 2014-06-23 10:27:43 +10:00
Rob H
a7cd6def4f Amend readme 2014-06-23 10:25:52 +10:00
Will Marshall
3fc337299b Adding ponies and filtering 2014-06-20 17:14:05 +10:00
Rob H
0785509bc4 Add plus icon to new order cycles button 2014-06-20 17:00:36 +10:00
Rob H
9f285b1d8c Add plus icon to new enterprises button 2014-06-20 17:00:07 +10:00
Rob H
a448ccdad4 Remove unused enterprise show page 2014-06-20 16:53:04 +10:00
Will Marshall
1eaf2c3bc5 Fixing missing taxons 2014-06-20 16:50:31 +10:00
Rob H
d71966b5c0 Change show link to edit link on admin enterprises index 2014-06-20 16:39:09 +10:00
Rob H
4b437e2ab5 Realign enterprises social media form components 2014-06-20 16:38:10 +10:00