20096 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Abashian	3caeb91419	Merge pull request #2689 from mabashian/2676-jobs-pagination ... Fixes pagination on IG/Instance jobs lists	2018-07-26 14:49:05 -04:00
mabashian	fa414d5569	Display job id along with name in jobs list	2018-07-26 14:46:53 -04:00
John Mitchell	0d9dbc15a7	remove org and last used, fix expired datetime on app token list	2018-07-26 13:57:45 -04:00
Jared Tabor	1ba6073569	Merge pull request #2092 from jaredevantabor/ui-test-ci-failures ... Bumping uirouter version and locking it to make ui tests pass	2018-07-26 09:06:16 -07:00
Ryan Petrello	7acfe414a6	Merge pull request #2686 from ryanpetrello/non-exclusive-policy-instance-list ... show the manual instance tag based on the correct instance attribute	2018-07-26 11:32:43 -04:00
mabashian	7a509a4dcb	Fixes pagination on IG/Instance jobs lists	2018-07-26 10:56:11 -04:00
Alan Rominger	979eaeddfa	Merge pull request #2687 from AlanCoding/play_nice ... fix conflicting migrations	2018-07-26 10:45:08 -04:00
AlanCoding	d1b89815f7	fix conflicting migrations	2018-07-26 10:38:26 -04:00
Ryan Petrello	bb034f007a	show the manual instance tag based on the correct instance attribute ... see: https://github.com/ansible/tower/issues/2583	2018-07-26 10:24:35 -04:00
Christian Adams	0694fa83b0	Merge pull request #2682 from rooftopcellist/remove_client_credentials ... Remove Client Credentials grant_type	2018-07-26 10:18:46 -04:00
Alan Rominger	e96706b2fa	Merge pull request #2090 from christoph-kluge/patch-1 ... Upgrade ansible-tower-cli if it was preinstalled	2018-07-26 09:26:13 -04:00
Ryan Petrello	57fdbc1853	Merge pull request #2677 from ryanpetrello/non-exclusive-policy-instance-list ... make InstanceGroup.policy_instance_list non-exclusive by default	2018-07-25 21:10:15 -04:00
Jared Tabor	2d7e5b7905	Bumping uirouter version and locking it to make ui tests pass on shippable ... There was a breaking change in uirouter 1.0.19 so going to lock it at 1.0.18. There was an issue with hard-source-webpack-plugin that was effecting the UI dev watcher that I'm including in this change.	2018-07-25 15:28:12 -07:00
adamscmRH	87829ea339	remove client credentials grant_type	2018-07-25 18:23:08 -04:00
Jake McDermott	76d83b0acb	Merge pull request #2681 from jakemcdermott/test-stability-fixes ... improve stability of inventory copy test and credentials form test	2018-07-25 18:10:44 -04:00
Jake McDermott	404950104b	fix logic error in test	2018-07-25 17:46:24 -04:00
Ryan Petrello	15aaca8f03	make InstanceGroup.policy_instance_list non-exclusive by default ... see: https://github.com/ansible/tower/issues/2583	2018-07-25 17:26:13 -04:00
Jake McDermott	5586b5c645	improve test stability for inventory copy and credentials form	2018-07-25 17:11:20 -04:00
Alan Rominger	5a7119759a	Merge pull request #2672 from AlanCoding/popin_locking ... Lock IG for updating list	2018-07-25 15:48:41 -04:00
Jared Tabor	a4960a9c3a	Merge pull request #2667 from jaredevantabor/dep-lockdown ... Adds npm-shrinkwrap and locks down ui-router version	2018-07-25 10:36:15 -07:00
Yunfan Zhang	fec1e8d398	Merge pull request #2363 from YunfanZhang42/fix_crendential_copy ... Fix credential leak when copying Job Templates	2018-07-25 13:14:40 -04:00
Stoned Elipot	ada2d65547	force boolean evaluation	2018-07-25 19:10:31 +02:00
Jared Tabor	239dcac3b4	Merge pull request #2 from jaredevantabor/jared/dep-lockdown ... Shrink-wrap dev dependencies as well	2018-07-25 09:45:51 -07:00
Yunfan Zhang	cb6d7dfe69	Fix credential leak when copying Job Templates. ... Signed-off-by: Yunfan Zhang <yz322@duke.edu>	2018-07-25 11:51:17 -04:00
kialam	9e164b41a6	Shrink-wrap dev dependencies as well	2018-07-25 11:46:13 -04:00
AlanCoding	39cb9f2652	lock IG for updating list	2018-07-25 11:08:40 -04:00
Ryan Petrello	27fbfbb62d	Merge pull request #2668 from ryanpetrello/verify-csrf-websockets ... prevent cross site request forgery in websockets w/ a CSRF token	2018-07-25 10:15:36 -04:00
Ryan Petrello	af84b25726	prevent cross site request forgery in websockets w/ the CSRF token ... now that we have the CSRF middleware, we have a reliable token available to us which we can use to verify individual ws_receive payloads; this is _simpler_ than making sure you've properly configured trusted origins, and it's also more secure than Origin header checks see: https://github.com/ansible/tower/issues/2661	2018-07-25 09:47:53 -04:00
Christian Adams	d2d5b8ca62	Merge pull request #2664 from rooftopcellist/help_text_ext_user_tokens ... help text for oauth ext user toggle	2018-07-25 09:20:55 -04:00
adamscmRH	12279b9631	help text for oauth ext user toggle	2018-07-25 08:54:37 -04:00
Jared Tabor	36e5300be6	Adds npm-shrinkwrap and locks down ui-router version	2018-07-24 21:05:44 -07:00
Jared Tabor	53c9c0b7f8	Merge pull request #2626 from jaredevantabor/fix-1501 ... Removes trailing slash for retrieving the scheduler partial	2018-07-24 17:44:37 -07:00
Ryan Petrello	0692b1c5ef	Merge pull request #2665 from mabashian/socket-whitelist ... Adds websocket origin whitelist to development.py	2018-07-24 17:03:47 -04:00
mabashian	bf40dc4793	Adds websocket origin whitelist	2018-07-24 16:53:48 -04:00
Ryan Petrello	982db88349	Merge pull request #2663 from ryanpetrello/origin-verify-refactor ... slightly refactor origin validity checks	2018-07-24 15:31:31 -04:00
Ryan Petrello	c81d2f53c5	slightly refactor origin validity checks	2018-07-24 15:16:09 -04:00
Christoph Kluge	fe54b44f96	Upgrade ansible-tower-cli if it was preinstalled ... In order to make this document a bit more fault-tolerant I've been adding the `--upgrade` parameter to the installation.	2018-07-24 20:55:09 +02:00
Michael Abashian	21568f74c0	Merge pull request #2624 from mabashian/2612-jt-scm ... Limit the cred types that we show when adding creds to JT	2018-07-24 14:24:03 -04:00
Michael Abashian	73851a6a56	Merge pull request #2657 from mabashian/hard-source-webpack-plugin ... Bumps hard-source-webpack-plugin dev dep	2018-07-24 14:23:33 -04:00
Michael Abashian	d7b545b023	Merge pull request #2656 from mabashian/2654-jobs-inv ... Correctly links to inventory on jobs/templates list	2018-07-24 14:22:15 -04:00
Ryan Petrello	6d1a8ec6ec	Merge pull request #2655 from ryanpetrello/fix-ws-cross-origin ... improve robustness of host comparision for wss:// Origin headers	2018-07-24 13:43:05 -04:00
Ryan Petrello	4b3ca080d4	improve robustness of host comparision for wss:// Origin headers ... see: https://github.com/ansible/tower/issues/2647	2018-07-24 13:30:04 -04:00
mabashian	e3601b71c0	Bumps hard-source-webpack-plugin dev dep	2018-07-24 12:04:45 -04:00
Matthew Jones	74123647fe	Merge pull request #2078 from john-westcott-iv/2073_no_galaxy ... #2073 - Support setting to prevent Tower from pulling roles	2018-07-24 12:01:18 -04:00
Matthew Jones	533318de3b	Merge pull request #2085 from chrismeyersfsu/fix-saml_admin_attr2 ... fix saml_admin_attr	2018-07-24 11:48:33 -04:00
mabashian	5d5a6bb858	Correctly links to inventory on jobs/templates list	2018-07-24 11:47:58 -04:00
Ryan Petrello	c0da6f04cd	Merge pull request #2648 from ryanpetrello/fix-ws-cross-origin ... [3.3.0] reject ws:// connections w/ origin mismatches	2018-07-24 10:13:46 -04:00
Bill Nottingham	90c03af61b	Merge pull request #2646 from wenottingham/a-moment-like-this ... Fix moment minute specifier.	2018-07-24 10:02:48 -04:00
Alan Rominger	f0252f67dc	Merge pull request #2625 from AlanCoding/just_role ... Write special cases for object_association field	2018-07-24 07:46:22 -04:00
Ryan Petrello	e7279f2fe2	reject ws:// connections w/ origin mismatches ... see: https://github.com/ansible/tower/issues/2647	2018-07-23 21:56:31 -04:00