Commit Graph

  • b3520c4385 Bugfix for specs Rafael Schouten 2014-10-02 16:49:32 +10:00
  • 526ab8b80f use is_distributor bool Rafael Schouten 2014-10-02 16:28:01 +10:00
  • f29898886d return basic css and js for oldskool login that somehow still exists Rafael Schouten 2014-10-02 13:24:59 +10:00
  • 1e84e4fa85 own and any instead of single and full for abilities Rafael Schouten 2014-10-02 13:11:19 +10:00
  • ce9b132ab5 only show visible enterprises Rafael Schouten 2014-10-02 13:10:46 +10:00
  • 5f4b2a752b Product controller loads correct data for create and update actions Rob Harrington 2014-10-02 12:32:26 +10:00
  • 4c1fc5671f Minor fixes Rafael Schouten 2014-10-02 10:43:17 +10:00
  • e62e87549a commit this elsewhere Rafael Schouten 2014-10-02 10:41:43 +10:00
  • 62f7114fa1 Merge branch 'cleanup' into migrate_ent_types Rafael Schouten 2014-10-02 10:02:08 +10:00
  • 47dc001735 merge has_shopfront and is_distibutor Rafael Schouten 2014-10-01 20:27:53 +10:00
  • 3877bed62b use enterprise modal Rafael Schouten 2014-10-01 18:51:49 +10:00
  • ccdcf16cec rename file Rafael Schouten 2014-10-01 18:47:50 +10:00
  • 54b138b2cc add transclusion to modal directive by default Rafael Schouten 2014-10-01 18:47:22 +10:00
  • 412bf8f638 cleanup gemfile Rafael Schouten 2014-10-01 17:16:09 +10:00
  • b647f9382f revert included file Rafael Schouten 2014-10-01 17:11:00 +10:00
  • 56a9658b14 update ability spec Rafael Schouten 2014-10-01 16:55:41 +10:00
  • 47991f192e tweak migration Rafael Schouten 2014-10-01 16:49:47 +10:00
  • 4fde0ad2d7 Merge branch 'master' into migrate_ent_types Rafael Schouten 2014-10-01 16:11:20 +10:00
  • 1ec4f2e456 Merge branch 'ent_types_frontend' into migrate_ent_types Rafael Schouten 2014-10-01 16:10:43 +10:00
  • 3a14a26bc6 refactor wysiwyg Rafael Schouten 2014-10-01 16:07:10 +10:00
  • fa41f6dc40 add rollback to migration Rafael Schouten 2014-10-01 13:02:03 +10:00
  • 5497f229e1 Ignoring enterprise ownership before_validations when no owner set Rob Harrington 2014-10-01 11:49:46 +10:00
  • 206c8da0ba remove unused css* Rafael Schouten 2014-09-30 23:53:45 +10:00
  • a2dff2305f space in order confirm mailer Rafael Schouten 2014-09-26 18:12:34 +10:00
  • 726340fc86 configure textAngular on enterprise edit page Rafael Schouten 2014-09-30 18:20:45 +10:00
  • 823923f828 add textAngular javascript Rafael Schouten 2014-09-30 15:09:43 +10:00
  • a49991c696 set abilities tests to pending, need to discuss further Rafael Schouten 2014-09-28 22:55:49 +10:00
  • dc7c9ea272 commit updated schema Rafael Schouten 2014-09-28 22:37:26 +10:00
  • 58f13a3e06 update migration Rafael Schouten 2014-09-28 12:57:27 +10:00
  • 5c0d846643 bugfix sells and is_distributor specs and code Rafael Schouten 2014-09-28 11:55:46 +10:00
  • b821107c27 bugfix migration ad specs Rafael Schouten 2014-09-27 18:14:10 +10:00
  • beb85e862a get type > sells migration mostly working Rafael Schouten 2014-09-27 15:21:27 +10:00
  • dee869a273 move checks and links in sidebars Rafael Schouten 2014-09-26 17:57:45 +10:00
  • 0c99007323 Tweak the modal styling for register modals summerscope 2014-09-26 17:45:15 +10:00
  • 92a40fc842 order mailer edits 0.6.3 Rafael Schouten 2014-09-26 17:15:21 +10:00
  • 4b2f1cefa0 Spliting order management abilities out of product management abilities Rob Harrington 2014-09-26 17:11:11 +10:00
  • c91d707806 Merge branch 'master' into ent_types_frontend summerscope 2014-09-26 15:07:30 +10:00
  • 299b0fe5be Allowing all enterprise users to access products Rob Harrington 2014-09-26 14:52:45 +10:00
  • 2ea0c89899 Style the modal headers summerscope 2014-09-26 14:55:35 +10:00
  • 237d129710 Changing the markup to give a class where is a producer summerscope 2014-09-26 14:55:10 +10:00
  • e9c8547ca3 fix enterprsie model logic Rafael Schouten 2014-09-26 14:48:37 +10:00
  • dee503befb Tweak language around the long description summerscope 2014-09-26 12:07:58 +10:00
  • 781fcae946 Change styling for register modals summerscope 2014-09-26 12:07:38 +10:00
  • 3adf571c1f Style the modal headers summerscope 2014-09-26 14:55:35 +10:00
  • c43b8abcbc Changing the markup to give a class where is a producer summerscope 2014-09-26 14:55:10 +10:00
  • 3406f926fc fix enterprsie model logic Rafael Schouten 2014-09-26 14:48:37 +10:00
  • e480d3a135 rearrange admin sidebars Rafael Schouten 2014-09-26 13:06:29 +10:00
  • c1460afaee Tweak language around the long description summerscope 2014-09-26 12:07:58 +10:00
  • a73541da71 Change styling for register modals summerscope 2014-09-26 12:07:38 +10:00
  • d3c8e4a547 Replacing reference to is_profile Rob Harrington 2014-09-26 11:18:54 +10:00
  • a6e8d6906f Tweak message on profile label summerscope 2014-09-26 11:20:09 +10:00
  • ceb978783c update missed taxon selector filter Rafael Schouten 2014-09-26 00:25:19 +10:00
  • 4b576d1590 refactor enterprise specs Rafael Schouten 2014-09-25 23:54:31 +10:00
  • 04c5dff497 fixup merge Rafael Schouten 2014-09-25 19:47:00 +10:00
  • 55f4415c0d Merge branch 'master' into cleanup Rafael Schouten 2014-09-25 19:42:20 +10:00
  • be17d80cc4 Fixing hubs service spec Rob Harrington 2014-09-25 17:28:01 +10:00
  • 85b27f5b51 Adding angularjs-file-upload to spec manifest Rob Harrington 2014-09-25 17:25:48 +10:00
  • b55b4e9a0c Merge branch 'master' into ent_types_frontend Rob Harrington 2014-09-25 17:20:15 +10:00
  • 33dff551c7 Removing 'show profiles' from producer and shop pages Rob Harrington 2014-09-25 17:19:14 +10:00
  • 1e31dd88ee Remove unrequired functions, add has_hub_listing Rob Harrington 2014-09-25 17:02:18 +10:00
  • cbc8a62686 STyling for profile only small view summerscope 2014-09-25 17:02:41 +10:00
  • 3b7cd6d329 Making the styling work for profiles and producers summerscope 2014-09-25 16:54:17 +10:00
  • 97ae170dd1 Add in profile only use case to styling summerscope 2014-09-25 16:40:06 +10:00
  • 3812d1eebb Add more greys summerscope 2014-09-25 16:39:48 +10:00
  • 2e1b2ffe12 Add italics summerscope 2014-09-25 16:04:27 +10:00
  • a068411b7d Add in class to show when hub is summerscope 2014-09-25 16:00:03 +10:00
  • 6069127733 validate contact email Rafael Schouten 2014-09-25 15:16:50 +10:00
  • afd0f76d9e Merge branch 'master' into bugfix Rafael Schouten 2014-09-25 14:23:46 +10:00
  • f8b083e4b7 fix lost hub link Rafael Schouten 2014-09-25 14:04:10 +10:00
  • bab9123ca8 delete unused javascript Rafael Schouten 2014-09-25 14:01:06 +10:00
  • 096324cf5e bugfix filters Rafael Schouten 2014-09-25 13:46:08 +10:00
  • 0e2774882f dry enterprise angular Rafael Schouten 2014-09-25 13:03:18 +10:00
  • f5849e91dc Adding limit reached modal to registration Rob Harrington 2014-09-25 12:25:32 +10:00
  • 6fa7d9cbcb Registration controller checks number of owned enterpises Rob Harrington 2014-09-25 12:10:45 +10:00
  • 9520eeeb15 can specify attributes for create_enterpise_user Rob Harrington 2014-09-25 11:56:18 +10:00
  • 3775cd29cb generalise search filter to any enterprise Rafael Schouten 2014-09-25 11:34:49 +10:00
  • da620f3723 Merge branch 'master' into ent_types_frontend Rafael Schouten 2014-09-25 10:09:42 +10:00
  • f8d5b7ede8 refactor enterprise types to six options Rafael Schouten 2014-09-24 23:30:43 +10:00
  • ed91cd6463 Make sure d1 != d2 Rob Harrington 2014-09-24 20:48:52 +10:00
  • a058af8211 open products in new tab Rafael Schouten 2014-09-24 17:00:12 +10:00
  • 139da3ac7a outline inputs with errors Rafael Schouten 2014-09-24 16:59:57 +10:00
  • b5ef24bacb table matchers use capybara matchers rather than wait_until with micro-sleep Rob Harrington 2014-09-24 16:18:59 +10:00
  • f0f165a129 Explicitly create enterprises in order_cycle factory to fix intermittent fail Rob Harrington 2014-09-24 14:00:08 +10:00
  • 1a86206e1f Fixing super annoying server reload bug Rob Harrington 2014-09-24 13:01:40 +10:00
  • c6d463bf25 Revert "Pending bulk order mgmt specs" Rob Harrington 2014-09-20 18:06:42 +10:00
  • b86848269b Merge branch 'specs' into reg_images Rob Harrington 2014-09-19 23:44:31 +10:00
  • 5bceb81479 Fixing image upload in onboarding Rob Harrington 2014-09-19 23:37:02 +10:00
  • 509cf6250a Explicitly sort managed products Rob Harrington 2014-09-19 17:59:31 +10:00
  • 07275574b6 Manager can't bulk update owner Rob Harrington 2014-09-19 17:51:49 +10:00
  • 5d2d619d66 Assigning @spree_api_key for store Rob Harrington 2014-09-19 16:09:26 +10:00
  • 17ce80a417 Allow new user to create enterprises Rob Harrington 2014-09-19 15:30:53 +10:00
  • d86c3cff26 Making enterprise header styles show as turquoise when no shopfront to click through to summerscope 2014-09-19 17:48:24 +10:00
  • 5e4e939087 Return template markup which was accidentally removed in Rafs merge summerscope 2014-09-19 17:47:49 +10:00
  • 559d3b0e4b fixup the header but needs some styling Rafael Schouten 2014-09-19 17:24:41 +10:00
  • 883e5f1095 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend Rafael Schouten 2014-09-19 17:22:29 +10:00
  • abc5a215a2 add map modals, profile filters and bugfixes Rafael Schouten 2014-09-19 17:07:07 +10:00
  • 919f87df58 change modal styling to improve look of Close button, overall layout for modals summerscope 2014-09-19 16:46:19 +10:00
  • cf13115d57 bugfix is_profile bool Rafael Schouten 2014-09-19 16:44:51 +10:00
  • 408f7b7f10 Modals styling refine for small use cases summerscope 2014-09-19 16:44:43 +10:00
  • e4991d4528 reorganise and document enterprise categories Rafael Schouten 2014-09-19 16:44:28 +10:00