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

10456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
jaredevantabor
49259e3588 adding explanation to left hand panel 2016-12-13 16:26:29 -08:00
jaredevantabor
4532945d5a adding result_traceback to the UI 2016-12-13 14:35:51 -08:00
Chris Meyers
248f030744 bump dyn inv sync scripts 2016-12-13 17:14:43 -05:00
Chris Meyers
732eb6c632 fix gce and maybe azure cert issues 2016-12-13 17:13:14 -05:00
Chris Meyers
f168416864 Merge pull request #4420 from chrismeyersfsu/fix-certs 
fix gce and maybe azure cert issues
 2016-12-13 17:12:15 -05:00
Chris Meyers
44c6127a48 fix gce and maybe azure cert issues 2016-12-13 17:11:44 -05:00
Michael Abashian
ec9065bc2f Added elapsed to the job default summary fields and removed started/finished 2016-12-13 16:55:03 -05:00
Matthew Jones
f89bd15bf5 Show started and finished on job summary fields 2016-12-13 15:27:48 -05:00
Michael Abashian
7e87f5031a Add 20px margin to the base workflow graph 2016-12-13 15:14:44 -05:00
Wayne Witzel III
f6a7b4c673 Merge pull request #4409 from wwitzel3/release_3.1.0 
squashed migrations to allow for migration removal after 3.1 release
 2016-12-13 14:51:23 -05:00
Wayne Witzel III
434b0f1f25 remove unneeded data migrations from squashed migrations 2016-12-13 14:42:24 -05:00
Wayne Witzel III
384dbb6da2 renamed squashed migrations to start at 0002 2016-12-13 14:41:23 -05:00
jaredevantabor
3fc575dd12 fix for job status on job results, and launched by 2016-12-13 10:59:33 -08:00
Wayne Witzel III
d79748bda7 Merge pull request #4414 from wwitzel3/r310 
allow API requests from localhost/127.0.0.1 to be insecure
 2016-12-13 13:53:58 -05:00
Leigh Johnson
923a50a5c1 fixes org lookup in teams add/edit form, #3830 (#4397) 2016-12-13 12:58:41 -05:00
Michael Abashian
b93156d9b0 Fixed "add between node" icon location when adding between the root and another node. 2016-12-13 12:06:23 -05:00
Wayne Witzel III
a8217ae3d3 adding squashed migrations to allow for migration removal after 3.1 release 2016-12-13 11:53:36 -05:00
Leigh Johnson
0803605ad7 @noissue - BrowserSync ssl/tls (#4407) 2016-12-13 11:50:13 -05:00
Wayne Witzel III
2069473534 allow API requests from localhost/127.0.0.1 to be insecure 2016-12-13 11:47:13 -05:00
Michael Abashian
48e95a7abb Merge pull request #4395 from mabashian/4163-template-list-audit 
Various fixes to the templates list based on audit feedback
 2016-12-13 09:36:08 -05:00
Michael Abashian
7e54783fca Fixed bug where UI was not hitting different endpoints when deleting wfjt labels v. normal jt labels 2016-12-13 09:26:32 -05:00
Wayne Witzel III
623d0a8df6 Merge pull request #4398 from wwitzel3/release_3.1.0 
Consolidate 3.1 migrations.
 2016-12-13 08:38:31 -05:00
jaredevantabor
074fe8a3d1 adding some fields to the job results left hand side panel 2016-12-12 16:33:37 -08:00
Wayne Witzel III
c9dab5805d update imports and further consolidate 2016-12-12 19:22:09 -05:00
Wayne Witzel III
83b985ed2e tower settings removal depends on conf migration 2016-12-12 19:21:10 -05:00
Wayne Witzel III
783e86bd41 Consolidate 3.1.0 migrations 2016-12-12 19:21:08 -05:00
Jared Tabor
d81bd9647e Merge pull request #4394 from jaredevantabor/workflow-results-labels 
making labels collapsible on workflow-results
 2016-12-12 14:41:31 -08:00
Alan Rominger
b7f469baab Merge pull request #4388 from AlanCoding/wfjt_copy_perm 
Fix WFJT copy RBAC bugs
 2016-12-12 16:17:02 -05:00
Matthew Jones
e1942083e3 Remove sneeringer's old unused decorator code 2016-12-12 16:14:22 -05:00
kensible
4063ef4353 Merge pull request #4400 from kensible/save-button-perms 
[Configure TinT] Save button permissions
 2016-12-12 16:04:50 -05:00