Commit Graph

10772 Commits

Author SHA1 Message Date
Chris Meyers 1e5eab63df Merge pull request #4638 from chrismeyersfsu/fix-4184_2
permission tab disable for private credentials
2017-01-10 16:20:09 -05:00
Chris Meyers ff41992194 don't include var if not going to use it 2017-01-10 15:52:08 -05:00
kensible 6a880449fb Merge pull request #4637 from kensible/4595-show-hide-ctint
Enable show/hide on password and secret fields
2017-01-10 15:23:21 -05:00
Chris Meyers 6c4df56223 Merge pull request #4630 from chrismeyersfsu/fix-4368_2
handle reload when deleting org card under edit
2017-01-10 13:00:18 -05:00
Chris Meyers fe896dbda5 permission tab disable for private credentials 2017-01-10 12:58:38 -05:00
Ken Hoes bc4bc2e8ce Enable show/hide on password and secret fields 2017-01-10 12:15:38 -05:00
kensible dca57b27e8 Merge pull request #4622 from kensible/3.1-audit-list-round2
Fixing audit bugs
2017-01-10 12:04:01 -05:00
Alan Rominger 6e6fd254dd Merge pull request #4629 from AlanCoding/is_new_in_14
Mark inventory scripts as added in 2.1.0
2017-01-10 11:59:51 -05:00
Alan Rominger ee2c8343ce Merge pull request #4631 from AlanCoding/wf_words
Workflow doc updates, excluding labels copy
2017-01-10 11:58:30 -05:00
AlanCoding 0a975736d9 further workflow doc copy edit with QE 2017-01-10 11:50:58 -05:00
AlanCoding e52e6ae192 handle case where the UJT related resource is null 2017-01-10 11:33:51 -05:00
AlanCoding 30fb6fcdd3 update clarification on what WFJT copy does 2017-01-10 11:14:44 -05:00
Ken Hoes 52c861503b Updated fix for form titles 2017-01-10 10:15:00 -05:00
Chris Meyers 7f6551ec20 consider org id in url an int 2017-01-10 10:12:09 -05:00
AlanCoding 78d8d4139a workflow docs revisions after label copy change 2017-01-10 10:09:29 -05:00
Chris Meyers 8caf355857 handle reload when deleting org card under edit 2017-01-10 09:50:54 -05:00
AlanCoding 4990a59fa7 mark inventory scripts as added in 2.1.0 2017-01-10 09:38:52 -05:00
kensible 624bdf6c88 Merge pull request #4616 from kensible/3.1-audit-list-round1
Fixing various audit bugs
2017-01-10 09:27:06 -05:00
Chris Meyers 87d77222a3 Merge pull request #4624 from chrismeyersfsu/fix-4265
handle undefined (empty) ec2 variable textarea
2017-01-10 09:01:35 -05:00
Michael Abashian b26122d9e1 Merge pull request #4612 from mabashian/permissions-columns
Fixed the column widths on the permissions modals
2017-01-09 18:35:34 -05:00
Chris Meyers 1e5b3fbe31 handle undefined (empty) ec2 variable textarea
* Adding a check for undefined, null check was not enough.
applyDefaults() is only called in 'add' mode. This method is responsible
for settings the fields value to the passed in 'default'. Since
applyDefaults() isn't called in 'edit' mode, the field has a value of
undefined.
2017-01-09 16:43:02 -05:00
Alan Rominger 17f0555362 Merge pull request #4623 from AlanCoding/unicode_inv_import
Unicode conversion of paths in inventory import
2017-01-09 15:59:57 -05:00
Chris Meyers 0faac129ec Merge pull request #4619 from chrismeyersfsu/fix-4447
move error divs down a line
2017-01-09 15:18:26 -05:00
AlanCoding 69527fdb08 unicode conversion of paths in inventory import 2017-01-09 15:10:02 -05:00
Ken Hoes 7816d8e39e Fixing audit bugs 2017-01-09 13:39:24 -05:00
Alan Rominger ee997e0ca7 Merge pull request #4618 from AlanCoding/new_in
Tower endpoint archaeology
2017-01-09 13:38:22 -05:00
Jared Tabor 9f01338c17 Merge pull request #4608 from jaredevantabor/cloud-credential-lookup
fixing the lookup modal for the group form's credential lookup
2017-01-09 09:59:32 -08:00
Chris Meyers 90be8644ec move error divs down a line 2017-01-09 12:53:45 -05:00
AlanCoding ad472c168f systematic update of new_in_xx flags 2017-01-09 12:25:04 -05:00
Alan Rominger ae463b2130 Merge pull request #4606 from AlanCoding/sys_jobs_start
Only accept extra_vars launchtime param for system jobs
2017-01-09 10:55:06 -05:00
Michael Abashian 3c1884ac38 Merge pull request #4607 from mabashian/permissions-bug-fix
Fixed bug that was preventing the user from adding permissions
2017-01-09 09:44:27 -05:00
Ken Hoes eeebf2ddf8 Fixing various audit bugs 2017-01-09 09:03:26 -05:00
Michael Abashian e4d661f659 Fixed the column widths on the permissions modals 2017-01-06 21:14:04 -05:00
jaredevantabor 8847110c23 removing unnecessary console.log statement 2017-01-06 15:36:22 -08:00
jaredevantabor 43a04e6ada fixing the lookup modal for groups-> add credential lookup
and fixing the ec2 lookup to query for "aws"
2017-01-06 15:08:42 -08:00
Michael Abashian f557d9cb71 Fixed bug that I introduced that was preventing permissions from being added 2017-01-06 17:08:49 -05:00
AlanCoding 8bc3befd03 only accept extra_vars launchtime param for system jobs 2017-01-06 16:54:07 -05:00
Alan Rominger d5247c6d95 Merge pull request #4515 from AlanCoding/relaunch_rbac
Custom PermissionDenied error for Workflow Job relaunch
2017-01-06 16:04:13 -05:00
Alan Rominger 6921cbfdd0 Merge pull request #4538 from AlanCoding/celery_log_reset
Celery log reset on CTiT change / task start
2017-01-06 15:36:45 -05:00
AlanCoding 5fcd467fe6 rename helper function for WJ relaunch 2017-01-06 14:44:29 -05:00
Alan Rominger c39c62973b Merge pull request #4574 from AlanCoding/4519
Provide __init__ arg for LDAP group type
2017-01-06 13:28:14 -05:00
Alan Rominger 0b0750d76e Merge pull request #4593 from AlanCoding/unhandled_perm_error
In JT /launch/ view deal with PermissionDenied in get_object()
2017-01-06 13:14:00 -05:00
Alan Rominger 62fb557473 Merge pull request #4597 from AlanCoding/1873
do not allow YAML strings that are OrderedDicts
2017-01-06 13:00:39 -05:00
Alan Rominger 5ca4eb06c3 Merge pull request #4596 from AlanCoding/silence
Silence Django19 warnings in ui views.py
2017-01-06 12:49:33 -05:00
Alan Rominger 4ed1b8590b Merge pull request #4583 from AlanCoding/jt_execute_schedule
Lower scheduling access requirement to execute role
2017-01-06 12:49:07 -05:00
Chris Meyers 3a2284229f Merge pull request #4359 from chrismeyersfsu/enhancement-artifacts_set_stats
set_stats support
2017-01-06 12:40:29 -05:00
Chris Meyers 86a9a921eb remove deepcopy, not sure how that slipped in 2017-01-06 11:47:45 -05:00
AlanCoding f07cd69012 corresponding test for dict extra_vars bug 2017-01-06 10:09:01 -05:00
Chris Meyers a1267a3dee update artifacts to work with ansible set_stats 2017-01-06 10:04:57 -05:00
AlanCoding 60cbc3cbbc do not allow YAML strings that are OrderedDicts 2017-01-06 08:24:40 -05:00