3954 Commits

Author	SHA1	Message	Date
Bill Nottingham	933cc83b90	Mark up UsersAdd properly.	2016-12-12 11:35:41 -05:00
Bill Nottingham	7bd8b8d051	Fix syntax, regenerate pot file. ... Thanks jshint!	2016-12-06 12:26:26 -05:00
Bill Nottingham	f4bf4e5971	Update	2016-12-06 12:08:48 -05:00
Bill Nottingham	832011aa99	Mark additional strings for translation.	2016-12-06 11:54:20 -05:00
Graham Mainwaring	5d5fe88a47	Move npm dependencies to Ansible github org	2016-12-06 10:14:08 -05:00
Michael Abashian	0706ae5981	Recognize edge conflicts when they arise and force the user to fix them before saving.	2016-12-05 15:08:02 -05:00
Michael Abashian	8ec2662f2e	Added templates activity stream view which is a combination of JT events and WFJT events	2016-12-05 09:45:27 -05:00
Michael Abashian	ba68c0c219	Merge pull request #4212 from mabashian/4148-incomplete-node ... Denote incomplete nodes	2016-12-02 16:53:15 -05:00
Chris Church	4f058506f7	Merge pull request #4142 from cchurch/fix-azuread-auth ... AzureAD auth updates.	2016-12-02 11:36:11 -05:00
Ken Hoes	0689fd81d8	Changed dropdown from Azure to Azure AD in CTinT	2016-12-02 11:17:58 -05:00
Michael Abashian	0dc7fa9890	Denoting incomplete nodes (nodes where the resource has been deleted or null'd out by copy)	2016-12-02 10:19:11 -05:00
Leigh Johnson	f7cbd0a021	Hooks up job_template and workflow_job_template scheduler routes, #3882 (#4215)	2016-12-01 20:32:49 -05:00
Leigh Johnson	4d1b10f0d1	Fixes missing Wait("stop") calls, resolves audit items in #3816 (#4218)	2016-12-01 20:32:06 -05:00
Leigh Johnson	1dab4f903c	Smart Search - support array of values per key (#4187) ... * Smart Search - support array of values per key, #4162 * lint	2016-12-01 17:55:53 -05:00
Michael Abashian	6022668706	Merge pull request #4203 from mabashian/4131-legend-workflow-details ... Add legend to workflow details view	2016-12-01 17:21:27 -05:00
Jared Tabor	496d6ae278	Merge pull request #4202 from jaredevantabor/workflow-elapsed ... adding duration filter for elapsed time on workflow results	2016-12-01 13:01:38 -08:00
Michael Abashian	6854ddac59	Add legend to workflow details view	2016-12-01 15:20:50 -05:00
jaredevantabor	4b10f2d71a	adding duration filter for elapsed time on workflow results ... relates to #4128	2016-12-01 10:45:11 -08:00
kensible	7dc6d5785f	Merge pull request #4194 from kensible/3939-image-upload-and-info ... Added custom info, fixed logout bug for logo	2016-12-01 13:40:16 -05:00
Jared Tabor	376098fe0a	Merge pull request #4195 from mabashian/4146-details-node-link ... Implemented details link on workflow node	2016-12-01 10:17:27 -08:00
Jared Tabor	f35ecda218	Merge pull request #4183 from jaredevantabor/workflow-badge-for-syncs ... adding workflow badge for project sync and inventory sync stdout	2016-12-01 09:55:46 -08:00
Michael Abashian	b93ca08b8c	Fix unit test failures	2016-12-01 12:02:13 -05:00
Michael Abashian	5fe066124e	Added details link to running/already finished running nodes	2016-12-01 12:02:13 -05:00
Ken Hoes	dc4217944d	Added custom info, fixed logout bug	2016-12-01 11:56:15 -05:00
Michael Abashian	3d56c2b50f	Merge pull request #4178 from mabashian/3583-copy-workflow ... Implemented WFJT copy and moved JT copy away from a viewless route	2016-12-01 09:20:54 -05:00
kensible	7f1885f167	Merge pull request #4171 from kensible/3939-image-upload ... Custom logo support through Tower in Tower	2016-12-01 09:16:41 -05:00
jaredevantabor	2cccf8455d	adding workflow badge for project sync and inventory sync stdout	2016-11-30 15:06:17 -08:00
jaredevantabor	0cde04a024	fixing Cancel on job template edit	2016-11-30 14:59:12 -08:00
jaredevantabor	be3ec6d8d8	making jerkins happy	2016-11-30 17:39:51 -05:00
jaredevantabor	7b3d9168df	making jerkins happy	2016-11-30 14:15:27 -08:00
Michael Abashian	50691b77db	Typo's and leftover injections that are no longer used.	2016-11-30 17:00:18 -05:00
Michael Abashian	089f369cc4	Implemented WFJT copy and moved JT copy away from a viewless route	2016-11-30 16:55:19 -05:00
kensible	1d9c52572d	Merge pull request #4172 from kensible/4151-azure-ctint ... Added Azure form to authentication section	2016-11-30 15:46:10 -05:00
jaredevantabor	7db6f35650	Filtering out project syncs by default on the jobs list ... by adding the query param `not__launch_type='sync'`	2016-11-30 12:28:04 -08:00
jaredevantabor	31781fa3d8	fixing some broken links on the job results page	2016-11-30 11:30:43 -08:00
Ken Hoes	90d163f126	Added Azure form to authentication section	2016-11-30 13:25:13 -05:00
Ken Hoes	8028b7ef75	Added image upload for custom logo	2016-11-30 13:15:30 -05:00
Ken Hoes	99fd30e84f	Added required, list parsing, form-gen cleaning	2016-11-30 13:15:30 -05:00
Jared Tabor	011d17613f	Merge pull request #4166 from jaredevantabor/job-results-labels ... Job Labels should be collapsible	2016-11-30 09:49:37 -08:00
Ken Hoes	200bbf55d9	Fixed merge conflicts	2016-11-30 09:39:27 -05:00
jaredevantabor	e53509520f	adding badge for indicating a job was launched by a workflow ... on the jobs list and the job results page	2016-11-29 17:16:35 -08:00
jaredevantabor	9dcd6d52af	making labels section collapsible on job results	2016-11-29 14:44:27 -08:00
Ken Hoes	84144ab806	Updated wording in dropdown and tabs	2016-11-29 13:24:16 -05:00
jaredevantabor	dc032489c2	fixing jshint errors	2016-11-29 09:57:20 -08:00
Chris Church	2e8faeaf0d	AzureAD auth updates. Add auth backend to settings, add microsoft icon to fontcustom, add azuread support to login modal.	2016-11-28 22:12:50 -05:00
Michael Abashian	29cc5d0f2e	Merge pull request #4129 from mabashian/3959-template-type-column-v2 ... Fix the type column on the templates list	2016-11-28 15:39:04 -05:00
Jared Tabor	4aea3ebc5b	Merge pull request #4125 from jaredevantabor/job-list-labels ... adding labels for job type on jobs list	2016-11-28 11:35:58 -08:00
jaredevantabor	d332c3bbe6	removing old lines	2016-11-28 11:34:42 -08:00
Michael Abashian	d76ef1419e	Added GetChoices to the templates list to properly display the template type	2016-11-28 13:44:28 -05:00
jaredevantabor	ff0a446d77	adding labels for job type on jobs list	2016-11-28 10:10:39 -08:00