8001 Commits

Author	SHA1	Message	Date
Aaron Tan	44cc57afba	Merge pull request #4017 from jangsutsr/3976_rename_type_in_wfjt_delete_conflict_message ... Rename type in workflow job template delete conflict message	2016-11-15 12:03:28 -05:00
Alan Rominger	50cafe4456	Merge pull request #3949 from AlanCoding/label_ct_opt ... Optimization to avoid query for count of JT / labels	2016-11-15 11:48:29 -05:00
Aaron Tan	c32185312b	Rename type in wfjt delete conflict message.	2016-11-15 11:27:31 -05:00
Chris Church	dac208f384	Merge pull request #4010 from cchurch/job-timeout-defaults ... Add default values for job timeouts.	2016-11-15 10:59:44 -05:00
Chris Church	21753ce49c	Merge pull request #4008 from cchurch/conf-jsonfield-fixes ... Fix configure Tower in Tower to work with updated django-jsonfield.	2016-11-15 10:57:42 -05:00
Chris Church	3eb6f55a80	Default JSONField to empty dict if field does not allow None.	2016-11-15 10:21:34 -05:00
Chris Meyers	e7b9410361	fix up python requirements test	2016-11-15 09:19:29 -05:00
Chris Meyers	1883485724	towards virtualenv being exactly requirements.txt ... * Ignore already installed (usually global) packages when installing requirements.txt into the virtualenv.	2016-11-15 09:19:29 -05:00
AlanCoding	262f82af43	flake8 fix	2016-11-15 08:42:22 -05:00
AlanCoding	5258c2a040	Remove in-place operations on model in test_label unit test	2016-11-15 08:33:29 -05:00
AlanCoding	1ca9426270	Remove in-place operation on User in unit test	2016-11-15 08:06:40 -05:00
Chris Church	443f100b5f	Add default values for job timeouts.	2016-11-15 01:12:06 -05:00
Chris Church	8dc5e7725c	Fix configure Tower in Tower to work with updated django-jsonfield.	2016-11-15 00:22:55 -05:00
Alan Rominger	731420a834	Merge pull request #3992 from AlanCoding/jsonfd_monkey ... New method to monkeypatch JSONField	2016-11-14 17:12:47 -05:00
AlanCoding	339661a6a5	New method to monkeypatch JSONField	2016-11-14 16:35:56 -05:00
Chris Meyers	9f40e7ef70	fix notification unit test mock	2016-11-14 16:29:34 -05:00
jaredevantabor	fb7be12110	Removing stale pendo file ... a working version of this file exists in a directory above this file already	2016-11-14 12:42:11 -08:00
jaredevantabor	1b79503075	making workflow-results panels the height of the viewport	2016-11-14 10:00:22 -08:00
Chris Meyers	c95ef4dc07	add requirements unit test	2016-11-11 17:19:52 -05:00
Michael Abashian	887afb79f8	Merge pull request #3978 from mabashian/3528-workflow-launch-transition ... Transition the user to the workflow details view after launch	2016-11-11 16:16:39 -05:00
Leigh Johnson	649dbef47d	Initialize empty global.$ENV in RC builds, resolves #3940 (#3981)	2016-11-11 16:15:23 -05:00
Michael Abashian	392ee19290	Transition the user to the workflow details view after launch	2016-11-11 15:56:45 -05:00
AlanCoding	059345e330	avoid reading notification configuration from already-serialized data	2016-11-11 15:23:49 -05:00
Chris Meyers	5b4892250d	fix partial test ... * We shouldn't care what order the inventory updates for the inventory sources are returned in.	2016-11-11 15:13:28 -05:00
Chris Meyers	0efe8e9cfb	fix license test ... so that the license file on dev machines isn't accidentally picked up	2016-11-11 14:43:00 -05:00
Alan Rominger	e7d9fe0204	Merge pull request #3951 from AlanCoding/label_test_fix ... Environment specific label test failure fix	2016-11-11 12:52:50 -05:00
Alan Rominger	93f68ad0e2	Merge pull request #3956 from AlanCoding/spec_update ... Change survey_spec validation to work with newer JSONField	2016-11-11 12:52:38 -05:00
Michael Abashian	b08a8a7997	Quick fix to get adding inventory source nodes working within workflows	2016-11-11 11:43:34 -05:00
Michael Abashian	b9927edccd	Merge pull request #3955 from mabashian/jshint-fixes ... Fixed lingering jshint errors	2016-11-11 11:37:21 -05:00
AlanCoding	d105414708	change survey_spec validation to work with newer JSONField	2016-11-11 10:59:51 -05:00
Michael Abashian	88fb6ca4af	Fixed lingering jshint errors	2016-11-11 10:40:41 -05:00
Leigh Johnson	53760be4ae	Update job_template param naming. Fixes error thrown on transition from job template add => edit state. @NoIssue	2016-11-11 10:31:45 -05:00
Michael Abashian	99eb7ff02b	Merge pull request #3931 from mabashian/workflows-branched-s3 ... Add/Edit Workflows with smart search integration	2016-11-11 09:51:50 -05:00
AlanCoding	15558aac08	environment specific label test failure fix	2016-11-11 09:40:35 -05:00
AlanCoding	edda2beded	apply optimization to avoid query for count of JT labels	2016-11-11 08:26:03 -05:00
Michael Abashian	92840b2752	Fixed broken templates name link. It should now appropriately redirect the user to the edit JT/WFJT page	2016-11-10 18:17:05 -05:00
Michael Abashian	44625b4a76	Turn smart status back on. This will throw a js error for workflow rows until recent_jobs are added as a summary_field to workflows	2016-11-10 18:03:35 -05:00
Michael Abashian	caa773020c	Pulled in the colors css files so that I can use @color-names instead of hex	2016-11-10 17:51:51 -05:00
Michael Abashian	c3a3b2662e	Internationalized workflow related forms	2016-11-10 17:43:41 -05:00
Michael Abashian	ca32c34036	Added a lot of permissions related logic to the workflow form as well as the workflow maker. I know it's not perfect but its a step in the right direction.	2016-11-10 16:44:11 -05:00
Shane McDonald	8c4872836e	Fix pyc errors when running tests	2016-11-10 16:20:12 -05:00
jaredevantabor	9f7ac059b7	Small fix for projects list to update on successful websocket messages	2016-11-10 13:10:22 -05:00
Matthew Jones	30984a3a79	Fix up flake8 errors	2016-11-10 13:07:48 -05:00
Alan Rominger	75c364930f	Merge pull request #3932 from AlanCoding/rbac_related_fixes ... Quick RBAC check_related fixes	2016-11-10 12:20:42 -05:00
Matthew Jones	1a3d452a2d	Fix an auth issue in the browsable api ... Trying to get the object could raise an unhandleable permission error if the user wasn't logged in for certain views	2016-11-10 11:46:25 -05:00
Matthew Jones	5186e7d8b4	Remove some unneeded func tests for instances	2016-11-10 11:46:25 -05:00
jaredevantabor	740daba640	Merge branch 'devel' of https://github.com/ansible/ansible-tower into devel	2016-11-10 11:35:00 -05:00
jaredevantabor	b3dbc59df6	Fixing jobs list page: adding launch & cancel buttons ... and making sure that you can launch jobs from the jobs list, and that sockets work with the jobs list for live updates	2016-11-10 11:34:06 -05:00
Michael Abashian	59aeec5705	Small fixes based on PR review feedback	2016-11-10 11:22:08 -05:00
Chris Meyers	9aaf694acf	always allow running at least 1 job ... * Regardless of capacity * Add unit tests around this logic	2016-11-10 11:07:05 -05:00