Commit Graph

  • 09cc3c6285 Styling for hero image underlay used on enterprises- adjust min heights for different text use cases summerscope 2014-09-19 16:44:16 +10:00
  • 5a7175e75d Tweak markup to make modals fit headers nicely across small sizes summerscope 2014-09-19 16:43:31 +10:00
  • 1c0196cf5d Change language for Kirsten summerscope 2014-09-19 16:25:34 +10:00
  • c6acbc6810 Assigning @spree_api_key for store Rob Harrington 2014-09-19 16:09:26 +10:00
  • eeb54f3f76 Allow new user to create enterprises Rob Harrington 2014-09-19 15:30:53 +10:00
  • 4c7fa4eb9f Fix markup so that text is not nested inside icon markup summerscope 2014-09-19 15:19:47 +10:00
  • e5fc3c19e3 Working on refining scroll on modals summerscope 2014-09-19 14:41:17 +10:00
  • 544e6e074a Stop being lazy Rob Harrington 2014-09-19 14:38:59 +10:00
  • d3e72b5a2a Adding images to registration process Rob Harrington 2014-09-19 12:34:48 +10:00
  • f9cbdcee0a swap profile name Rafael Schouten 2014-09-19 12:18:02 +10:00
  • 527a139f72 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend Rafael Schouten 2014-09-18 18:17:41 +10:00
  • 64fdbcf04f update enterprise type spec Rafael Schouten 2014-09-18 18:17:31 +10:00
  • 0d5106d571 refactor enterprise type logic and fix icons Rafael Schouten 2014-09-18 18:15:28 +10:00
  • 9a4ba5aa1f Producer page styling and logic for markup summerscope 2014-09-18 16:15:14 +10:00
  • e1769e638d More styling for producer page summerscope 2014-09-18 16:14:53 +10:00
  • 24ca1b064a Tweak language for help popover summerscope 2014-09-18 15:34:56 +10:00
  • 0b59ca2dc1 Turning Show Profiles checkbox back on ready for logic summerscope 2014-09-18 15:33:44 +10:00
  • 7f4bccc956 fix anchor angular for link to hub shopfront summerscope 2014-09-18 15:22:53 +10:00
  • 20a76626b9 Add styling for instance where producer is own shopwfront on producer page summerscope 2014-09-18 15:22:29 +10:00
  • 1fdcbbec40 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend Rafael Schouten 2014-09-18 15:15:01 +10:00
  • bd922085c4 icons and entity category logic Rafael Schouten 2014-09-18 15:14:55 +10:00
  • c42f83b6b1 Tweak markup to show producer name and write logic for link around producer if also own shopfront summerscope 2014-09-18 15:13:48 +10:00
  • d75076e1c9 producer icons and inital link logic Rafael Schouten 2014-09-18 13:59:47 +10:00
  • 21628ed069 Merge branch 'master' into ent_types_frontend2 Rafael Schouten 2014-09-17 17:45:55 +10:00
  • e9dd863462 Merge branch 'master' into payment_description Rafael Schouten 2014-09-17 17:07:43 +10:00
  • 83b19ee632 fix haml and formatting on confirm email Rafael Schouten 2014-09-17 16:56:44 +10:00
  • 79fd8ed98b dubug mail template Rafael Schouten 2014-09-17 15:37:38 +10:00
  • e618c4c2c0 add payment description to checkout Rafael Schouten 2014-09-17 14:56:29 +10:00
  • ee6b71b140 Merge pull request #260 from openfoodfoundation/currency rafaqz 2014-09-17 13:47:37 +10:00
  • 1c9bb906d1 Merge branch 'currency' of https://github.com/openfoodfoundation/openfoodnetwork into currency Rafael Schouten 2014-09-17 13:21:56 +10:00
  • ac3c3f9f6c remove to_f on decimals Rafael Schouten 2014-09-17 13:19:34 +10:00
  • 6829636f11 comit ng-tst changes elsewhere Rafael Schouten 2014-09-17 13:19:08 +10:00
  • 98ba135d49 Explain weird spree override rafaqz 2014-09-17 13:12:27 +10:00
  • 4a93e9e94f Merge branch 'master' into currency Rafael Schouten 2014-09-17 12:49:10 +10:00
  • a5680e611e add example yml Rafael Schouten 2014-09-17 12:05:28 +10:00
  • b6fd3a11fa remove old mailer Rafael Schouten 2014-09-17 11:54:06 +10:00
  • f79dfed6ef use haml for mailer Rafael Schouten 2014-09-17 11:53:47 +10:00
  • 0fdbcc0023 Make dates consistent Rob Harrington 2014-09-17 11:39:39 +10:00
  • eead8d665f Pending bulk order mgmt specs Rob Harrington 2014-09-17 11:39:20 +10:00
  • 01c98bf6e4 refactor and bugfix for tests Rafael Schouten 2014-09-17 01:07:34 +10:00
  • 22e61d9834 TEMP: spit out variables in failing oc spec Rob Harrington 2014-09-16 23:47:34 +10:00
  • 279c5925ef Add helpers to registration spec to counter JS weirdness Rob Harrington 2014-09-16 23:46:34 +10:00
  • 9e2e96d19e Schema weirdness Rob Harrington 2014-09-16 23:45:36 +10:00
  • 49476b17e8 fix typos and add missing helper Rafael Schouten 2014-09-16 16:10:48 +10:00
  • 1aa80e53b1 Merge branch 'master' into currency Rafael Schouten 2014-09-16 10:25:22 +10:00
  • 15bfe75313 ifnore figaro Rafael Schouten 2014-09-16 00:21:10 +10:00
  • 9448e1cbe4 add figaro env config Rafael Schouten 2014-09-16 00:13:43 +10:00
  • 5cf09d264c fix suburb typo Rafael Schouten 2014-09-14 12:27:02 +10:00
  • 143545da0d Try newer syntax to fix spec failing on CI Rob H 2014-09-12 23:41:26 +10:00
  • 0815775bc3 Temporary fix for race condition in registration spec Rob H 2014-09-12 17:22:54 +10:00
  • 30bcdde5ca Merge branch 'ent_types_frontend' into working Rob H 2014-09-12 16:45:58 +10:00
  • cb7033eea0 Registration spec checks enterprise created and updated Rob H 2014-09-12 16:42:10 +10:00
  • 25a889375c Fix unreliable spec Rohan Mitchell 2014-09-12 16:38:32 +10:00
  • b41029d5d0 Spec reliability: Explicitly set a $0 calculator for shipping method Rohan Mitchell 2014-09-12 16:10:32 +10:00
  • d2c5533549 Remove use_short_wait Rob H 2014-09-12 16:10:38 +10:00
  • cc9d2ebbac Modal styling fixes for scrolling on mobile view summerscope 2014-09-12 16:01:25 +10:00
  • 799bfae6e4 Revert "Add commented-out scrolling code. Return false from click handlers." summerscope 2014-09-12 15:51:20 +10:00
  • c365047d0c Short description goes back in producer fat view until we can clean up the HTML formatting summerscope 2014-09-12 15:40:12 +10:00
  • dbefd43f07 Add commented-out scrolling code. Return false from click handlers. Rohan Mitchell 2014-09-12 15:33:02 +10:00
  • 8507690865 Fixing enterprise owner migration Rob H 2014-09-12 15:23:13 +10:00
  • 42fccd1bdf Merging master into my branch to make it up to date summerscope 2014-09-12 14:48:19 +10:00
  • 3cff83b7a5 Kill the outside modal close button styling once and for all summerscope 2014-09-12 14:42:58 +10:00
  • 05d8c825c7 Enterprise User should NOT see form elements for changing type Rob H 2014-09-12 13:40:47 +10:00
  • 0dd33e6635 Modal styling updates ated trying to fix mobile scrolling issue. getting there. summerscope 2014-09-12 13:40:00 +10:00
  • bcca8c5c0d Merging master into all the things Rob H 2014-09-12 13:28:30 +10:00
  • f5048ecf7c Sends confirmation email when Enterprise is created Rob H 2014-09-12 13:24:17 +10:00
  • 4fb30f2942 When removing outgoing exchanges, do not removing variants from other outgoing exchanges Rohan Mitchell 2014-09-12 12:50:04 +10:00
  • 5c7ab2efa3 Restrict editing of ownership and type in enterprise api controller Rob H 2014-09-12 12:47:16 +10:00
  • 9a1b524915 fix icon font class Rafael Schouten 2014-09-12 12:21:40 +10:00
  • cc65faadd0 Specing out enterprise registration service properly Rob H 2014-09-12 11:48:17 +10:00
  • a28eaba31a Turn off price graph pop overs for small devices summerscope 2014-09-12 11:45:13 +10:00
  • e50bbeaefb Edit product form shows permitted suppliers Rohan Mitchell 2014-09-12 11:33:47 +10:00
  • 1c5a495d5c Making icons smaller, adding a bit of background shadow to pop them out summerscope 2014-09-12 11:29:41 +10:00
  • a6556f3a4f Fix broken JS specs Rohan Mitchell 2014-09-12 11:12:35 +10:00
  • 033fe88513 New product form shows permitted suppliers Rohan Mitchell 2014-09-12 11:07:59 +10:00
  • bfa71942fe Tweaks to input placeholder label summerscope 2014-09-12 11:02:28 +10:00
  • 01397b2e49 Tweaks to filter box summerscope 2014-09-12 11:01:35 +10:00
  • 6ee3010fa7 Differentiation of on-boarding process by url Rob H 2014-09-12 11:00:34 +10:00
  • ecacde41dd Tweaks to big input for small screens summerscope 2014-09-12 11:00:10 +10:00
  • 126e9e82a6 Add in blues for use summerscope 2014-09-12 10:58:51 +10:00
  • 9c33be911c Update placeholder label summerscope 2014-09-12 10:49:59 +10:00
  • 6d7fd6dc94 Add in logic to change right hand label if this is the current hub summerscope 2014-09-12 10:48:33 +10:00
  • 309ddece89 make profile icons work Rafael Schouten 2014-09-12 10:38:04 +10:00
  • 3ea29df111 12 option entity categories Rafael Schouten 2014-09-12 10:11:59 +10:00
  • 05782b6ec1 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend Rafael Schouten 2014-09-12 09:59:55 +10:00
  • f33a9e1a58 16 enterprise categories from four checks. Rafael Schouten 2014-09-12 01:45:51 +10:00
  • 043cc915e7 Removing save_screenshot calls Rob H 2014-09-11 22:40:03 +10:00
  • 5007fd8ec3 Shipping method 1 is used, so shipping method amount is zero Rob H 2014-09-11 22:27:05 +10:00
  • a7a99b5048 Pending registration spec Rob H 2014-09-11 18:15:33 +10:00
  • 12f5e48479 Replace is not with isnt - damn you CoffeeScript Rob H 2014-09-11 17:58:38 +10:00
  • 98f7e58f9d Registration spec expects the correct url Rob H 2014-09-11 17:58:05 +10:00
  • de64a5154b Fixing markup icon class name was incorrect summerscope 2014-09-11 17:13:07 +10:00
  • 048a741a2c Plugging final two registration pages into validation Rob H 2014-08-27 11:51:13 +10:00
  • 19565a5f3b Rename service Rob H 2014-08-27 11:50:46 +10:00
  • fc0afae51c Adding form validation to contact page Rob H 2014-08-24 18:46:14 +10:00
  • 454e4c971a Adding validation to address page Rob H 2014-08-24 16:43:10 +10:00
  • 34841f8543 Refactoring registration form controller Rob H 2014-08-24 12:24:16 +10:00
  • 412e906ed3 Adding basic validation to reg process Rob H 2014-08-24 11:20:00 +10:00
  • 800eecea33 Fix failing bulk specs Rob H 2014-08-24 10:08:50 +10:00
  • 8d570286a1 Adding in sexy logic to add color to name depending on type summerscope 2014-08-22 17:53:05 +10:00