Commit Graph

3040 Commits

Author SHA1 Message Date
Rafael Schouten
6fc36a3e6c swap redundant producer modal for general enterprise modal 2014-10-07 10:48:04 +11:00
Rafael Schouten
ec6805f573 use shared partial for no results 2014-10-06 23:51:19 +11:00
Rafael Schouten
7805d46743 more angular documentation 2014-10-06 23:20:43 +11:00
Rafael Schouten
881e82e825 add some angular documentation 2014-10-06 22:59:06 +11:00
Rafael Schouten
2ae325455a fix producer taxon filtering bug 2014-10-06 22:58:48 +11:00
Rafael Schouten
922e335e83 add is_hub to model 2014-10-06 15:42:23 +11:00
Rafael Schouten
cc6af82823 move reports abilitiy to can manage products block, producers need to use this too 2014-10-06 15:40:41 +11:00
Rafael Schouten
76e170eb3a move icons into cached, for now 2014-10-06 10:44:49 +11:00
Rafael Schouten
9eb770aed7 fix sidebar show/hide 2014-10-05 01:44:40 +10:00
Rafael Schouten
2f76a7ba80 add comment for hub sells own case 2014-10-05 01:44:12 +10:00
Rafael Schouten
58c39b340d remove duplicate default value assignment 2014-10-05 01:43:50 +10:00
Rafael Schouten
b3482a087b separate enterprises from visible enterprises 2014-10-04 01:00:37 +10:00
Rafael Schouten
a552fb18da style profile check 2014-10-04 01:00:02 +10:00
Rafael Schouten
2670d2b0ad cleanup serializer 2014-10-04 00:59:41 +10:00
Rafael Schouten
01063367c4 clickable show profiles label 2014-10-04 00:59:17 +10:00
Rafael Schouten
b3520c4385 Bugfix for specs 2014-10-02 16:49:32 +10:00
Rafael Schouten
526ab8b80f use is_distributor bool 2014-10-02 16:28:01 +10:00
Rafael Schouten
f29898886d return basic css and js for oldskool login that somehow still exists 2014-10-02 13:24:59 +10:00
Rafael Schouten
1e84e4fa85 own and any instead of single and full for abilities 2014-10-02 13:11:19 +10:00
Rafael Schouten
ce9b132ab5 only show visible enterprises 2014-10-02 13:10:46 +10:00
Rafael Schouten
4c1fc5671f Minor fixes 2014-10-02 10:43:17 +10:00
Rafael Schouten
62f7114fa1 Merge branch 'cleanup' into migrate_ent_types
Conflicts:
	app/views/home/_hubs.html.haml
2014-10-02 10:02:08 +10:00
Rafael Schouten
47dc001735 merge has_shopfront and is_distibutor 2014-10-01 20:27:53 +10:00
Rafael Schouten
3877bed62b use enterprise modal 2014-10-01 18:51:49 +10:00
Rafael Schouten
ccdcf16cec rename file 2014-10-01 18:47:50 +10:00
Rafael Schouten
54b138b2cc add transclusion to modal directive by default 2014-10-01 18:47:22 +10:00
Rafael Schouten
4fde0ad2d7 Merge branch 'master' into migrate_ent_types 2014-10-01 16:11:20 +10:00
Rob Harrington
5497f229e1 Ignoring enterprise ownership before_validations when no owner set 2014-10-01 11:49:46 +10:00
Rafael Schouten
206c8da0ba remove unused css* 2014-09-30 23:53:45 +10:00
Rafael Schouten
5c0d846643 bugfix sells and is_distributor specs and code 2014-09-28 11:55:46 +10:00
Rafael Schouten
b821107c27 bugfix migration ad specs 2014-09-27 18:14:10 +10:00
Rafael Schouten
beb85e862a get type > sells migration mostly working 2014-09-27 15:21:27 +10:00
Rafael Schouten
92a40fc842 order mailer edits 2014-09-26 17:21:41 +10:00
Rob Harrington
4b2f1cefa0 Spliting order management abilities out of product management abilities 2014-09-26 17:11:11 +10:00
Rob Harrington
299b0fe5be Allowing all enterprise users to access products 2014-09-26 15:01:23 +10:00
summerscope
2ea0c89899 Style the modal headers 2014-09-26 15:01:23 +10:00
summerscope
237d129710 Changing the markup to give a class where is a producer 2014-09-26 15:01:23 +10:00
Rafael Schouten
e9c8547ca3 fix enterprsie model logic 2014-09-26 15:01:23 +10:00
summerscope
dee503befb Tweak language around the long description 2014-09-26 15:01:22 +10:00
summerscope
781fcae946 Change styling for register modals 2014-09-26 15:01:22 +10:00
Rob Harrington
d3c8e4a547 Replacing reference to is_profile 2014-09-26 11:20:55 +10:00
summerscope
a6e8d6906f Tweak message on profile label 2014-09-26 11:20:09 +10:00
Rafael Schouten
ceb978783c update missed taxon selector filter 2014-09-26 00:25:19 +10:00
Rafael Schouten
4b576d1590 refactor enterprise specs 2014-09-26 00:15:33 +10:00
Rafael Schouten
04c5dff497 fixup merge 2014-09-25 19:47:00 +10:00
Rafael Schouten
55f4415c0d Merge branch 'master' into cleanup
Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml
2014-09-25 19:42:20 +10:00
Rob Harrington
b55b4e9a0c Merge branch 'master' into ent_types_frontend 2014-09-25 17:20:15 +10:00
Rob Harrington
33dff551c7 Removing 'show profiles' from producer and shop pages 2014-09-25 17:19:57 +10:00
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
summerscope
cbc8a62686 STyling for profile only small view 2014-09-25 17:02:41 +10:00