Commit Graph

2272 Commits

Author SHA1 Message Date
Rob H
569327ecce Merge branch 'master' into working 2014-07-03 10:15:45 +10:00
summerscope
75f3358e2a Adding CTA button for crowdfunding site to homepage & countdown timer directive 2014-07-02 14:44:46 +10:00
Will Marshall
ce3cb7890b Removing old product modal 2014-06-27 15:16:08 +10:00
Will Marshall
f316b8dec5 Adding product modals in new format 2014-06-27 15:15:41 +10:00
Will Marshall
7b673870cd Adding bulk icons 2014-06-27 15:04:56 +10:00
Will Marshall
e8ba36041b Tests and patch for group filter 2014-06-27 15:01:12 +10:00
Will Marshall
8bd8d811b1 Unbreaking the groups page 2014-06-27 14:51:55 +10:00
Will Marshall
e4c8c19fea Tweaking the producer modal 2014-06-27 14:39:50 +10:00
Will Marshall
03c84cbfe5 Fixing missing taxon icons 2014-06-27 14:39:50 +10:00
Rohan Mitchell
aa5767cd30 Remove paypal image button from checkout, fix redirect to paypal 2014-06-27 11:52:36 +10:00
Rohan Mitchell
4075854440 Navigation.go supports full URLs 2014-06-27 11:51:53 +10:00
Will Marshall
821724b01e Merge branch 'master' into laura_and_will 2014-06-26 15:33:51 +10:00
Will Marshall
8480cf7866 Tab fixes, new tests, reworking modals 2014-06-26 15:32:55 +10:00
Will Marshall
9eb43e6c09 Removing visible scopes from enteprise distributors and producers 2014-06-26 15:26:15 +10:00
Will Marshall
9755bd2251 Refactoring slightly 2014-06-26 15:17:19 +10:00
Will Marshall
ed6bb2275a Fixing some regressions in tests, switching favicons 2014-06-26 15:04:32 +10:00
Will Marshall
0b8ca9af47 Adding visibility filtering to map 2014-06-26 14:49:40 +10:00
Will Marshall
a4e675e675 Refactoring visibility handling 2014-06-26 14:48:46 +10:00
Will Marshall
8862fd555c Removing ng-animate, changing our enterprise restriction 2014-06-26 14:36:16 +10:00
Rob H
44fb34d7be Rearrange admin title 2014-06-26 12:20:42 +10:00
Will Marshall
a1789a8058 Removing old serializers 2014-06-26 12:17:38 +10:00
summerscope
fdb1c64c63 Merge branch 'master' into laura_and_will 2014-06-26 11:16:42 +10:00
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
4f3d468db6 Dereferencing groups and adding modals to page 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
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
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