14357 Commits

Author SHA1 Message Date
Shane McDonald
5af04e3164 Add pycrypto to Tower's requirements files
This is needed for GCE inventory syncs to work. Inventory Syncs run through the Tower virtual environment.
2017-08-10 09:10:10 -04:00
Marliana Lara
1f902743cf Merge pull request #234 from marshmalien/fix/3403-wide-view-only-survey-modal
Shrink view-only survey modal
2017-08-10 09:08:25 -04:00
Michael Abashian
308acc4bc9 Merge pull request #233 from mabashian/7404-credentials-activity
Added activity stream link to credentials
2017-08-10 08:40:29 -04:00
Michael Abashian
ee28e683e0 Merge pull request #232 from mabashian/7410-inv-permissions
Give list-actions a static height in case all its contents are hidden
2017-08-10 08:40:06 -04:00
Chris Meyers
c0b9c76a41 stringify uuid so it can be serialized 2017-08-10 07:32:03 -04:00
Jared Tabor
961d186e5e Merge pull request #231 from jaredevantabor/remove-password-settings
removing hard chkpass directive and some other hard-coded configs
2017-08-09 15:18:58 -07:00
Jared Tabor
c7a86a3c6a removing hard chkpass directive and some other hard-coded configs 2017-08-09 14:33:18 -07:00
Chris Meyers
51855f1b82 Merge pull request #226 from chrismeyersfsu/fix-7399
reap waiting processes if crash
2017-08-09 14:44:37 -04:00
Chris Meyers
c3f24d878d reap waiting processes if crash 2017-08-09 14:01:33 -04:00
Marliana Lara
9be9e74348 Shrink survey modal in view-only mode 2017-08-09 11:41:23 -04:00
mabashian
a97f6237c4 Added activity stream link to credentials 2017-08-09 11:05:12 -04:00
Michael Abashian
ae6fd2e484 Merge pull request #229 from mabashian/7403-smart-inv-activity-stream
Fixed activity stream for smart inventory
2017-08-09 10:34:46 -04:00
Michael Abashian
d39de55168 Merge pull request #227 from mabashian/2895-pagination
Small pagination fixes when changing page size
2017-08-09 10:34:14 -04:00
mabashian
b9db642b30 Give list-actions a static height in case all its contents are hidden 2017-08-09 10:32:07 -04:00
Alan Rominger
616b47db1b Merge pull request #225 from AlanCoding/more_provisioning
update awx-manage command to new name
2017-08-09 10:13:22 -04:00
Alan Rominger
6092d65069 Merge pull request #224 from AlanCoding/multi_judgement_race
log specific errors for problems managing lost instance
2017-08-09 10:11:22 -04:00
Alan Rominger
531ffa1f92 Merge pull request #220 from AlanCoding/py_inv
show executable python files in inventory list
2017-08-09 08:43:27 -04:00
mabashian
bab497a0c1 Fixed activity stream for smart inventory 2017-08-08 16:42:43 -04:00
mabashian
5b4b532959 Small pagination fixes when changing page size 2017-08-08 15:49:50 -04:00
Michael Abashian
0c17744871 Merge pull request #208 from mabashian/5893-wf-delete-root
Fixed workflow bug deleting root parent while creating child
2017-08-08 15:24:49 -04:00
AlanCoding
afb267cee9 update awx-manage command to new name 2017-08-08 15:18:07 -04:00
AlanCoding
93aed04389 log specific errors for problems managing lost instance 2017-08-08 14:48:21 -04:00
AlanCoding
ca807f9c69 show executable python files in inventory list 2017-08-08 14:12:02 -04:00
Alan Rominger
cddd9dfbef Merge pull request #223 from AlanCoding/test_wording
Fix 3.2 API tests in Jenkins
2017-08-08 14:06:10 -04:00
AlanCoding
5f4d033836 change test to match with recent error message change 2017-08-08 13:57:51 -04:00
Jared Tabor
9bb6ec28fe Merge pull request #215 from jaredevantabor/host-event-json
adding error message if no json was returned for host event
2017-08-08 09:48:10 -07:00
Jared Tabor
c7d81fdba4 Merge pull request #219 from jaredevantabor/third-party-errors
Remove that pesky error message
2017-08-08 09:46:05 -07:00
Aaron Tan
bf67477404 Merge pull request #204 from jangsutsr/make_up_missing_migrations
Make up missing migrations
2017-08-08 12:23:12 -04:00
Alan Rominger
3ef63daf2b Merge pull request #221 from AlanCoding/names_names_32
use standard type string algorithm in scheduler
2017-08-08 11:18:01 -04:00
Ryan Petrello
6dedcb60be Merge pull request #205 from ryanpetrello/remove-pycrypto
replace PyCrypto usage w/ crytography; ansible no longer bundles it
2017-08-08 10:51:07 -04:00
Chris Meyers
4e2f075fa6 better scm inv restriction error message 2017-08-08 10:42:38 -04:00
AlanCoding
59249d013b use standard type string algorithm in scheduler 2017-08-08 10:40:10 -04:00
Marliana Lara
6a862269b7 Merge pull request #214 from marshmalien/fix/7010-pending-delete-undefined-inventory
Prevent 'pending_deletion' on undefined inventory
2017-08-08 10:38:00 -04:00
Aaron Tan
d8ebaa2851 Make up missing migrations 2017-08-08 10:35:19 -04:00
Alan Rominger
e13cd823aa Merge pull request #206 from AlanCoding/new_names2
Change awx-manage command names (try #2)
2017-08-08 09:26:59 -04:00
Alan Rominger
8e22c7e668 Merge pull request #168 from AlanCoding/silence_computed_fields
silence benign errors from inventory computed fields task
2017-08-08 09:24:30 -04:00
Alan Rominger
d7f869f566 Merge pull request #155 from AlanCoding/dev_ig_supervisor
functionality for dev + IG + supervisor configuration
2017-08-08 09:22:39 -04:00
Alan Rominger
c009173722 Merge pull request #189 from AlanCoding/no_proj_update
manually update SCM inv src on bulk update
2017-08-08 09:18:12 -04:00
Alan Rominger
40c01d9ba7 Merge pull request #190 from AlanCoding/no_inv_src_ig
do not use inventory source instance groups
2017-08-08 09:14:15 -04:00
Alan Rominger
9f63624292 Merge pull request #192 from AlanCoding/alan_bug
fix logger bug introduced in task except
2017-08-08 09:12:53 -04:00
Ryan Petrello
7b3846e62d Merge pull request #216 from ryanpetrello/fix-7398
return proper stdout size for DB-backed stdout (like system jobs)
2017-08-08 09:09:43 -04:00
Shane McDonald
00283b00dc Merge pull request #218 from shanemcd/fix-openshift-image-builds
Fix OpenShift container image builds
2017-08-07 22:07:40 -04:00
Jared Tabor
b27a6f7be6 return console errors for 3rd party login instead of in modal in the UI 2017-08-07 17:20:11 -07:00
Jared Tabor
09082c8bea changing wording of message 2017-08-07 16:44:01 -07:00
Shane McDonald
f4aacebb86 Fix OpenShift container image builds 2017-08-07 17:31:18 -04:00
Ryan Petrello
61aa7c1ad7 return proper stdout size for DB-backed stdout (like system jobs)
see: https://github.com/ansible/ansible-tower/issues/7398
2017-08-07 17:08:25 -04:00
Jared Tabor
a40f81c327 adding error message if no json was returned for host event
aka if event_data.res is undefined
2017-08-07 13:55:23 -07:00
Marliana Lara
6cd8fbdf6d Merge pull request #202 from marshmalien/fix/7201-hide-inv-tooltip
Hide all active popovers while source-summary-tooltip is active
2017-08-07 16:31:38 -04:00
Marliana Lara
8974df6983 Merge pull request #207 from marshmalien/fix/3044-job-launch-modal-password-button
Prevent "SHOW/HIDE" toggle from jerking the view upward
2017-08-07 16:30:20 -04:00
Marliana Lara
4abefbfe7e Check if inventory is undefined before assigning pending_deletion flag 2017-08-07 16:01:07 -04:00