External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity
10,488 Commits 54 Branches 19 Tags
Commit Graph

10488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Leigh Johnson
fed9806313 Reorganize awx/ui/client/src/access module structure 
addPermissions module => add-rbac-resource module
addPermissionsList module => rbac-multiselect-list module
roleSelect module => rbac-multiselect-role module
roleList module => rbac-role-column module

Use isolate scope in rbac-multiselect-role module
Move shared styles to module root
 2016-12-15 14:56:11 -05:00
Bill Nottingham
f77949b4b0 Merge pull request #4455 from wenottingham/setup-fu 
Drop stopping of munin.
 2016-12-15 14:28:30 -05:00
Leigh Johnson
666975bbc5 use in-line sourcemaps for javascripts (#4453) 2016-12-15 14:27:19 -05:00
Michael Abashian
8c94d4d40d Merge pull request #4452 from mabashian/3293-enable-ssh-unlock-network 
Enabled ssh_key_unlock field for network credentials
 2016-12-15 13:03:12 -05:00
Michael Abashian
17407f9e5c Merge pull request #4451 from mabashian/3827-password-toggle 
Fixed password toggles
 2016-12-15 13:02:54 -05:00
Michael Abashian
54e08256ba Enabled ssh_key_unlock field for network credentials 2016-12-15 12:22:39 -05:00
Michael Abashian
69292df170 Moved toggle password logic to a directive that can be added as an attribute of the button. 2016-12-15 12:07:08 -05:00
Michael Abashian
7f1591361b Merge pull request #4444 from mabashian/2106-job-concurrency 
Added UI support for simultaneous job template runs
 2016-12-15 11:27:42 -05:00
Michael Abashian
462c548aee Merge pull request #4442 from mabashian/4271-add-user-organization 
Fixed organization add user/admin save button functionality
 2016-12-15 11:27:24 -05:00
Alan Rominger
600c94dd40 Merge pull request #4390 from AlanCoding/do_not_copy_labels 
Do not copy WFJT labels in 3.1
 2016-12-15 10:06:45 -05:00
Chris Meyers
e69f6726d0 fix unit test 2016-12-15 09:31:58 -05:00
Chris Meyers
2ec47737bb another flake8 fix 2016-12-15 09:29:31 -05:00
Chris Meyers
f026a96d94 flake8 fix 2016-12-15 08:59:24 -05:00
Chris Meyers
7bc6d50b0b Merge pull request #4445 from chrismeyersfsu/fix-4225 
cancel job also cancels project update
 2016-12-15 08:46:43 -05:00
Jake McDermott
3ee8c4159a fix tooltip message for notification template (#4448) 2016-12-15 00:16:40 -05:00
jaredevantabor
0900484c62 hiding status icon on right hand side unless fullscreen is true 
for job results and workflow results, per request of trahman
 2016-12-14 14:25:08 -08:00
Chris Church
9c444e084e Handle psutil errors when terminating tasks. 2016-12-14 16:37:44 -05:00
Chris Meyers
bdfac35f3f cancel job also cancels project update 
related to #4225
 2016-12-14 16:26:18 -05:00
Michael Abashian
ffaa43941a Added UI support for simultaneous job template runs 2016-12-14 16:25:20 -05:00
Chris Church
e8f01c9029 Stringify the MAX_EVENT_RES_DATA setting when sticking it into an environment variable. 2016-12-14 16:13:06 -05:00
Matthew Jones
a25853a3a5 Updating translation artifacts 
* also installing translation tools into dev environment
* Removing fedora install instructions, no one here uses fedora
 2016-12-14 15:58:47 -05:00
Michael Abashian
912af09831 Fixed organization add user/admin save button functionality 2016-12-14 15:36:29 -05:00
Chris Church
a38ab75086 Merge pull request #4404 from cchurch/split-job-event-data 
Split job event data between callback queue and stdout.
 2016-12-14 15:23:13 -05:00
Chris Church
2b94e348e2 Merge pull request #4440 from matburt/split-job-event-data 
Purge event res dict if it is over a certain size
 2016-12-14 15:21:41 -05:00
Matthew Jones
1cd2a762be Reset max bytes display 2016-12-14 15:20:04 -05:00
Chris Church
2988ac1904 Only use known stats keys for determining hostnames to use for job host summaries. 2016-12-14 15:12:27 -05:00
Matthew Jones
a61e729ebb Purge event res dict if it is over a certain size 
Also purge/update some old settings values
 2016-12-14 15:05:28 -05:00
kensible
4b87e0a80d Merge pull request #4431 from kensible/4315-logging-settings 
[Configure TinT] Added logging, timeouts, various updates
 2016-12-14 14:37:26 -05:00
Chris Church
0a6d2f179e Extend stdout background to width of text. 2016-12-14 13:50:51 -05:00
Michael Abashian
8d067172bb Merge branch 'mabashian-4164-details-view-audit' into release_3.1.0 2016-12-14 13:49:23 -05:00
Michael Abashian
32001521be Merge branch '4164-details-view-audit' of https://github.com/mabashian/ansible-tower into mabashian-4164-details-view-audit 
# Conflicts:
#	awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
#	awx/ui/client/src/workflow-results/workflow-results.partial.html
 2016-12-14 13:48:48 -05:00
Michael Abashian
7c9dc5194c Merge pull request #4429 from mabashian/4273-add-credential-refresh-list 
Properly redirect after creating a new credential
 2016-12-14 13:33:07 -05:00
Jared Tabor
459b1891d2 Merge pull request #4436 from jaredevantabor/add-status 
adding status line to beginning of left side panel
 2016-12-14 10:30:10 -08:00
jaredevantabor
46e74a24f0 adding status line to beginning of left side panel 2016-12-14 10:27:22 -08:00
Chris Church
b9aab38185 Handle TypeError when lookup is not valid for a given field. 2016-12-14 13:20:19 -05:00
Wayne Witzel III
f95f75c55a Merge pull request #4435 from wwitzel3/release_3.1.0 
use DjangoJSONEncoder
 2016-12-14 13:13:13 -05:00
Wayne Witzel III
13798d352c use DjangoJSONEncoder 2016-12-14 12:49:50 -05:00
Chris Church
b947367606 Add default for ldap group type. 2016-12-14 11:54:50 -05:00
Jared Tabor
221392d1cf Merge pull request #4424 from jaredevantabor/job-results-left-panel 
Job results left panel
 2016-12-14 08:37:09 -08:00
Michael Abashian
d8f3356bae Merge pull request #4417 from mabashian/4132-offset-start-icon 
Add 20px margin to the base workflow graph
 2016-12-14 11:16:53 -05:00
Michael Abashian
c029922684 Merge pull request #4415 from mabashian/4138-add-node-position 
Fixed "add between node" icon location when adding between the root and another node
 2016-12-14 10:42:24 -05:00
Chris Meyers
b533a9eb7b purge make requirements_jenkins 2016-12-14 10:30:28 -05:00
Chris Meyers
34c3895768 Merge pull request #4421 from chrismeyersfsu/improvement-inventory_bump 
Improvement inventory bump
 2016-12-14 10:24:40 -05:00
Chris Meyers
010b9f540d Merge pull request #4428 from chrismeyersfsu/fix-certifi 
uninstall certifi if installed in venv's
 2016-12-14 10:23:54 -05:00
Michael Abashian
c4c5e67427 Properly redirect after creating a new credential 2016-12-14 10:16:33 -05:00
Ken Hoes
94aafda7df Added logging, timeouts, changed dropdown labels, updated system section 2016-12-14 10:15:33 -05:00
Chris Meyers
6348ed97dd uninstall certifi if installed in venv's 2016-12-14 09:53:24 -05:00
Michael Abashian
0ff5c06b2b Removed moment injection from the workflow chart directive - not needed 2016-12-14 09:41:32 -05:00
Michael Abashian
24ee84b094 Fixed various bugs after auditing the workflow details page 2016-12-14 09:31:18 -05:00
Michael Abashian
92d8813173 Merge pull request #4419 from mabashian/elapsed-summary-field 
Added elapsed to the job default summary fields and removed started/finished
 2016-12-14 09:27:45 -05:00