7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	412bf8f638	cleanup gemfile	2014-10-01 17:16:09 +10:00
Rafael Schouten	b647f9382f	revert included file	2014-10-01 17:11:00 +10:00
Rafael Schouten	56a9658b14	update ability spec	2014-10-01 16:55:41 +10:00
Rafael Schouten	47991f192e	tweak migration	2014-10-01 16:49:47 +10:00
Rafael Schouten	4fde0ad2d7	Merge branch 'master' into migrate_ent_types	2014-10-01 16:11:20 +10:00
Rafael Schouten	1ec4f2e456	Merge branch 'ent_types_frontend' into migrate_ent_types ... Conflicts: app/models/enterprise.rb	2014-10-01 16:10:43 +10:00
Rafael Schouten	3a14a26bc6	refactor wysiwyg	2014-10-01 16:07:10 +10:00
Rafael Schouten	fa41f6dc40	add rollback to migration	2014-10-01 13:02:21 +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	a2dff2305f	space in order confirm mailer	2014-09-30 19:39:56 +10:00
Rafael Schouten	726340fc86	configure textAngular on enterprise edit page	2014-09-30 18:20:45 +10:00
Rafael Schouten	823923f828	add textAngular javascript	2014-09-30 15:09:43 +10:00
Rafael Schouten	a49991c696	set abilities tests to pending, need to discuss further	2014-09-28 22:55:49 +10:00
Rafael Schouten	dc7c9ea272	commit updated schema	2014-09-28 22:37:26 +10:00
Rafael Schouten	58f13a3e06	update migration	2014-09-28 12:57:27 +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	dee869a273	move checks and links in sidebars	2014-09-26 17:58:00 +10:00
summerscope	0c99007323	Tweak the modal styling for register modals	2014-09-26 17:45:15 +10:00
Rafael Schouten	92a40fc842	order mailer edits 0.6.3	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
summerscope	c91d707806	Merge branch 'master' into ent_types_frontend	2014-09-26 15:07:30 +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
summerscope	3adf571c1f	Style the modal headers	2014-09-26 14:55:41 +10:00
summerscope	c43b8abcbc	Changing the markup to give a class where is a producer	2014-09-26 14:55:41 +10:00
Rafael Schouten	3406f926fc	fix enterprsie model logic	2014-09-26 14:48:37 +10:00
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00
summerscope	c1460afaee	Tweak language around the long description	2014-09-26 12:07:58 +10:00
summerscope	a73541da71	Change styling for register modals	2014-09-26 12:07:38 +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	be17d80cc4	Fixing hubs service spec	2014-09-25 17:28:01 +10:00
Rob Harrington	85b27f5b51	Adding angularjs-file-upload to spec manifest	2014-09-25 17:25:48 +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