Commit Graph

  • 06400c6202 Remove unused @include summerscope 2014-07-03 14:54:34 +10:00
  • ac54bf6b22 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork Maikel Linke 2014-07-03 14:32:06 +10:00
  • e0119a3f1f Adding perftools.rb Maikel Linke 2014-07-03 14:30:36 +10:00
  • 29fde37ba3 Merge branch 'bug-herd' into working Rob H 2014-07-03 14:24:39 +10:00
  • 569327ecce Merge branch 'master' into working Rob H 2014-07-03 10:15:45 +10:00
  • ef1b72cec9 Megalitres to Kilolitres Rafael Schouten 2014-07-03 00:07:57 +01:00
  • e89b782787 Use Kilolitres instead of Megalitres. Megalitres are REALLY big! Rafael Schouten 2014-07-02 23:20:54 +01:00
  • 570a33db5f Revert "install script". Prototype script should not yet be on master. Rohan Mitchell 2014-07-02 12:09:23 +10:00
  • 0301a97bfe Merge branch 'master' into laura_and_will summerscope 2014-07-02 14:45:11 +10:00
  • 75f3358e2a Adding CTA button for crowdfunding site to homepage & countdown timer directive summerscope 2014-07-02 14:44:46 +10:00
  • 96b4d0f873 Fix grumpy typo summerscope 2014-07-02 12:26:32 +10:00
  • 23ae0806e7 Add email link for error messages on 500 page summerscope 2014-07-02 11:51:48 +10:00
  • 106c9f63bb Adding animation hooks for Laura Will Marshall 2014-07-02 11:33:38 +10:00
  • 434e087a73 Merge branch 'master' into laura_and_will Will Marshall 2014-07-02 11:30:43 +10:00
  • 35bcebc823 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork Maikel Linke 2014-06-28 19:43:01 +10:00
  • 39012388a2 install script Maikel Linke 2014-06-28 19:41:45 +10:00
  • 9791374204 Add partial to producers index page summerscope 2014-06-27 17:27:46 +10:00
  • 9d397430d4 Add styling for filters block summerscope 2014-06-27 17:27:19 +10:00
  • 9f71ccc3c0 Filters partial for search field summerscope 2014-06-27 17:26:52 +10:00
  • fe11e50d3b Adding graphics for error message pages summerscope 2014-06-27 15:51:22 +10:00
  • 0291723239 Tweak layout and message for 500 summerscope 2014-06-27 15:50:55 +10:00
  • 9edec0c849 Tweak layout and message for 422 summerscope 2014-06-27 15:50:45 +10:00
  • 1dc0b1bc2f Tweak layout and message for 404 summerscope 2014-06-27 15:50:33 +10:00
  • ce3cb7890b Removing old product modal Will Marshall 2014-06-27 15:16:08 +10:00
  • f316b8dec5 Adding product modals in new format Will Marshall 2014-06-27 15:15:41 +10:00
  • 7b673870cd Adding bulk icons Will Marshall 2014-06-27 15:04:56 +10:00
  • e8ba36041b Tests and patch for group filter Will Marshall 2014-06-27 15:01:12 +10:00
  • 8bd8d811b1 Unbreaking the groups page Will Marshall 2014-06-27 14:51:55 +10:00
  • e4c8c19fea Tweaking the producer modal Will Marshall 2014-06-27 14:07:12 +10:00
  • 03c84cbfe5 Fixing missing taxon icons Will Marshall 2014-06-27 12:43:08 +10:00
  • 5a235be110 Fix regressed JS spec Rohan Mitchell 2014-06-27 11:56:09 +10:00
  • aa5767cd30 Remove paypal image button from checkout, fix redirect to paypal Rohan Mitchell 2014-06-27 11:52:36 +10:00
  • 4075854440 Navigation.go supports full URLs Rohan Mitchell 2014-06-27 11:51:53 +10:00
  • b678a2f7fd Move navigation spec to services dir Rohan Mitchell 2014-06-27 11:34:02 +10:00
  • 083fda0ad0 Set columns on BPE error messages Rob H 2014-06-27 10:46:54 +10:00
  • f8d51c3105 Fixing intermittent spec failure Will Marshall 2014-06-26 15:43:33 +10:00
  • 821724b01e Merge branch 'master' into laura_and_will Will Marshall 2014-06-26 15:33:51 +10:00
  • 8480cf7866 Tab fixes, new tests, reworking modals Will Marshall 2014-06-24 14:09:21 +10:00
  • 934f960336 Add display as to new product page Rob H 2014-06-26 15:27:24 +10:00
  • 9eb43e6c09 Removing visible scopes from enteprise distributors and producers Will Marshall 2014-06-26 15:26:15 +10:00
  • 9755bd2251 Refactoring slightly Will Marshall 2014-06-26 15:17:19 +10:00
  • ed6bb2275a Fixing some regressions in tests, switching favicons Will Marshall 2014-06-26 15:04:32 +10:00
  • 0b8ca9af47 Adding visibility filtering to map Will Marshall 2014-06-26 14:49:40 +10:00
  • a4e675e675 Refactoring visibility handling Will Marshall 2014-06-26 14:48:46 +10:00
  • 8862fd555c Removing ng-animate, changing our enterprise restriction Will Marshall 2014-06-26 14:36:16 +10:00
  • 44fb34d7be Rearrange admin title Rob H 2014-06-26 12:20:42 +10:00
  • a1789a8058 Removing old serializers Will Marshall 2014-06-26 12:17:38 +10:00
  • fdb1c64c63 Merge branch 'master' into laura_and_will summerscope 2014-06-26 11:16:42 +10:00
  • 9667b84c5c Finishing the transition to AMS from RABL Will Marshall 2014-06-26 11:07:53 +10:00
  • 8baf32f926 Merge branch 'master' into enterprise-json-perf Will Marshall 2014-06-25 16:31:16 +10:00
  • a49fe2bf65 Fixing a regression bug Will Marshall 2014-06-25 16:30:23 +10:00
  • 881c229855 Prevents turquoise color text on red button summerscope 2014-06-25 15:21:37 +10:00
  • 33b5359a16 Spiking AMS implementation of data Will Marshall 2014-06-25 15:18:13 +10:00
  • 9cb6987645 Refactoring the supplied_taxons query to use SQL Will Marshall 2014-06-25 15:18:00 +10:00
  • b1f275dac8 Adding enterprises to cart to prevent errors being thrown Will Marshall 2014-06-25 14:38:16 +10:00
  • 3687479c22 Fetch distributed_taxons in SQL Rohan Mitchell 2014-06-25 14:33:19 +10:00
  • e14470ad77 Fix placeholder text to reference Producer rather than Hub summerscope 2014-06-25 14:16:42 +10:00
  • 2c6e239962 Adding some basic animations, upgrading Angular Foundation Will Marshall 2014-06-25 13:59:22 +10:00
  • 5f242f9232 Fixing groups page anchor scrolling Will Marshall 2014-06-25 10:46:32 +10:00
  • edd9d93b8c Merge branch 'master' into laura_and_will Will Marshall 2014-06-24 17:16:22 +10:00
  • 4f3d468db6 Dereferencing groups and adding modals to page Will Marshall 2014-06-24 16:34:14 +10:00
  • 369761ccc5 Minor regression bug Will Marshall 2014-06-24 14:15:15 +10:00
  • c09555e380 Tab fixes, new tests, reworking modals Will Marshall 2014-06-24 14:09:21 +10:00
  • b3f0cb1e74 Bunch of minor bugfixes Will Marshall 2014-06-24 13:01:51 +10:00
  • 31529f0343 Make text links turquoise color for producers page summerscope 2014-06-24 16:58:01 +10:00
  • ff344533d9 Remove link for follow links on CONTACT for shopfront mini menu (tabs) - should be icon only summerscope 2014-06-24 16:51:58 +10:00
  • 64cca8cf36 Enabling map on production Will Marshall 2014-06-24 16:01:06 +10:00
  • 44d9104200 New favicon for staging and production versions of site summerscope 2014-06-24 15:47:27 +10:00
  • a9ce36d402 Minor regression bug Will Marshall 2014-06-24 14:15:15 +10:00
  • c0ac3c1b14 Tab fixes, new tests, reworking modals Will Marshall 2014-06-24 14:09:21 +10:00
  • 5c220ca30f Merge branch 'master' into laura_and_will Will Marshall 2014-06-24 14:08:57 +10:00
  • 11872931a5 Bunch of minor bugfixes Will Marshall 2014-06-24 13:01:51 +10:00
  • 563e605ad0 Tweak styling for text message on shopfront summerscope 2014-06-24 13:58:59 +10:00
  • a93a1a07cf Tweak styling for closed shoptfront summerscope 2014-06-24 13:50:18 +10:00
  • a36408e2a1 Tweak overflow for modal ABOUT styling so that browser never tries to add a horizontal scroll bar summerscope 2014-06-24 13:35:00 +10:00
  • d0b2f73c5a Tweak markup for PRODUCERS tab on mini menu summerscope 2014-06-24 13:25:45 +10:00
  • e0f5f51f92 Tweak markup for GROUPS tab on mini menu summerscope 2014-06-24 13:25:27 +10:00
  • 902d896218 Tweak markup for CONTACT tab on mini menu summerscope 2014-06-24 13:25:13 +10:00
  • 703ee5e566 Tweak markup for ABOUT tab on mini menu summerscope 2014-06-24 13:24:56 +10:00
  • a498ffb5a7 Add styles to improve the mini menu / tabs area of the shopfront and make it more consistent summerscope 2014-06-24 13:24:33 +10:00
  • e8bf2da69c Tweak small hero image styling summerscope 2014-06-24 13:24:11 +10:00
  • f7ba8cade0 Bunch of minor bugfixes Will Marshall 2014-06-24 13:01:51 +10:00
  • 9099fca11c Merge branch 'bug-herd' into working Rob H 2014-06-23 22:01:41 +10:00
  • 51d3f65934 Remove spree's product tab for all but admin users Rob H 2014-06-23 22:01:19 +10:00
  • 753a867142 'Back to Products List' on product edit page returns user to BPE Rob H 2014-06-23 15:54:53 +10:00
  • 7d1acc23ad Cancel button on new product form redirects to BPE Rob H 2014-06-23 15:54:14 +10:00
  • 9b126df5b6 Add variant display_name to reports Rob H 2014-06-23 14:31:16 +10:00
  • a21c2c20f7 Change 'Spree' in admin page title to 'OFN' Rob H 2014-06-23 11:26:46 +10:00
  • c56e0dfdae Add Laura to Readme Rob H 2014-06-23 10:52:23 +10:00
  • 3b0bf9c677 Amend readme Rob H 2014-06-23 10:27:43 +10:00
  • a7cd6def4f Amend readme Rob H 2014-06-23 10:25:52 +10:00
  • 3fc337299b Adding ponies and filtering Will Marshall 2014-06-20 17:14:05 +10:00
  • 0785509bc4 Add plus icon to new order cycles button Rob H 2014-06-20 17:00:36 +10:00
  • 9f285b1d8c Add plus icon to new enterprises button Rob H 2014-06-20 17:00:07 +10:00
  • a448ccdad4 Remove unused enterprise show page Rob H 2014-06-20 16:53:04 +10:00
  • 1eaf2c3bc5 Fixing missing taxons Will Marshall 2014-06-20 16:50:31 +10:00
  • d71966b5c0 Change show link to edit link on admin enterprises index Rob H 2014-06-20 16:39:09 +10:00
  • 4b437e2ab5 Realign enterprises social media form components Rob H 2014-06-20 16:38:10 +10:00
  • 21589fd5b0 Hack patching home page modals Will Marshall 2014-06-20 16:26:27 +10:00
  • 1ed634239d Major refactoring Will Marshall 2014-06-20 15:24:57 +10:00