1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

10375 Commits

Author SHA1 Message Date
Bill Nottingham
abbe41dbac Merge pull request #4298 from wenottingham/stringy
Mark more strings for translation.
2016-12-12 11:55:23 -05:00
Bill Nottingham
933cc83b90 Mark up UsersAdd properly. 2016-12-12 11:35:41 -05:00
Matthew Jones
2d6dff1a3b Better error handling on deprovision_node management command 2016-12-12 10:55:03 -05:00
Alan Rominger
ecdb9ac02a Merge pull request #4374 from AlanCoding/logger_reloading_PR
Chain reloading uWSGI on log setting change
2016-12-12 10:28:27 -05:00
Matthew Jones
aa0139078f Merge pull request #4371 from wenottingham/cannot-think-of-a-good-branch-name-today
Update project help for ConfigureTowerInTower.
2016-12-12 10:26:26 -05:00
Alan Rominger
39e5765f12 Merge pull request #4381 from AlanCoding/prefetch_optimizing
Use prefetch_related for several more things
2016-12-12 10:22:43 -05:00
Chris Meyers
d7a4a9d0c0 Merge pull request #4366 from chrismeyersfsu/fix-2_inv_updates_1_jt
fix two inv updates created from 1 jt run
2016-12-12 10:14:05 -05:00
Chris Meyers
c7f935367f Merge pull request #4369 from chrismeyersfsu/enhancement-dependencies
Enhancement dependencies
2016-12-12 10:13:59 -05:00
Chris Meyers
ed2a857ed9 Merge pull request #4370 from chrismeyersfsu/fix-remove_mongo
remove more mongo things
2016-12-12 10:13:49 -05:00
Alan Rominger
5ee11b5ba3 Merge pull request #4379 from AlanCoding/node_exec_rbac
Check for UJT start access when adding node
2016-12-12 10:12:20 -05:00
AlanCoding
4cc1642ab3 clarity edit of uWSGI chain reload task 2016-12-12 09:40:49 -05:00
Jake McDermott
07a395b738 Merge pull request #4326 from jakemcdermott/issue-3905
ensure new settings are placed by installer when updating tower
2016-12-12 09:05:27 -05:00
AlanCoding
a90bafe6f0 move various items to prefetch for optimization 2016-12-11 07:31:04 -05:00
AlanCoding
c3666752e6 check for UJT start access when adding node 2016-12-10 07:46:30 -05:00
Alan Rominger
75a85cdab2 Merge pull request #4376 from AlanCoding/wf_start_survey
Do not check survey license for workflow job relaunch
2016-12-09 16:49:26 -05:00
AlanCoding
c6f3d498de remove django configure_logging import 2016-12-09 16:07:47 -05:00
AlanCoding
c318b12428 do not check survey license for workflow job relaunch 2016-12-09 16:03:10 -05:00
AlanCoding
431dcc6490 switch to smoother chain reloading 2016-12-09 15:38:38 -05:00
AlanCoding
5ff62c97b6 uwsgi auto-reload on logging change 2016-12-09 15:21:03 -05:00
Chris Meyers
35fe4c8448 remove pyzmq 2016-12-09 14:34:32 -05:00
Bill Nottingham
56d8fa8ae6 Update project help for ConfigureTowerInTower. 2016-12-09 14:29:46 -05:00
Chris Meyers
40d5142d11 remove more mongo things 2016-12-09 14:19:41 -05:00
Chris Meyers
812b7c5f5f fix two inv updates created from 1 jt run 2016-12-09 14:09:58 -05:00
Chris Meyers
cc7c2957cf always chain failures
* When inv and proj updates trigger from a JT run, if either update
fails then the job template should get marked failed. Before this
commit, the job template would get marked failed ONLY if there was
enough capacity to run all the associated updates within the same
schedule() call. If, instead, the associated updates were ran in another
schedule() call, the failure chain was lost. This changeset fixes that
by saving the necessary data in the dependent_jobs relationship so that
the failure is always chained.
2016-12-09 14:09:54 -05:00
jlmitch5
fa0d9735f5 Merge pull request #4334 from jlmitch5/fixStdoutPaneWidth
fix standard out pane width from having double scroll bar
2016-12-09 14:01:42 -05:00
Chris Meyers
514839938b fix two inv updates created from 1 jt run 2016-12-09 13:39:12 -05:00
Leigh Johnson
aacae7b844 ui build system documents (#4353)
* add ui build system documentation, pin nodejs + npm engines to versions vetted for Tower

* Update ui_build_system.md

* Update ui_build_system.md
2016-12-09 12:33:01 -05:00
kensible
d24057e956 Merge pull request #4328 from kensible/3896-ctint-user-perms
3896 Configure Tower in Tower user restrictions/notifications
2016-12-09 10:04:58 -05:00
Ken Hoes
44e83dbcd7 Disabling fields for auditors in CTinT 2016-12-09 09:37:16 -05:00
Bill Nottingham
24c208e243 Merge pull request #4347 from wenottingham/hostvar
Look at 'ansible_host' for callbacks, not just 'ansible_ssh_host'. (#4346)
2016-12-08 18:42:34 -05:00
Aaron Tan
acfd12c85a Merge pull request #4352 from jangsutsr/4282_fix_wfj_node_related_destination
Fix wfj node related destination
2016-12-08 17:22:48 -05:00
Aaron Tan
e5278e2291 Fix wfj node related destination. 2016-12-08 16:40:07 -05:00
Michael Abashian
7be0979b60 Merge pull request #4344 from mabashian/4130-workflow-graph-badge-text
Change TOTAL JOBS to TOTAL TEMPLATES in the workflow maker
2016-12-08 16:15:13 -05:00
Michael Abashian
06e6f21881 Merge pull request #4348 from mabashian/4134-add-edit-node-helper-text
Tweaked workflow maker node help text based on how many nodes currently exist
2016-12-08 16:15:04 -05:00
Michael Abashian
809dc551d7 Merge pull request #4343 from mabashian/4327-activity-stream-fixes
Fixes for some Activity Stream bugs
2016-12-08 16:14:52 -05:00
Michael Abashian
bd0b591d30 Merge pull request #4337 from mabashian/4255-jt-details-popover
Added jt details popover when adding/eding workflow node
2016-12-08 16:14:38 -05:00
Michael Abashian
e8436699a9 Merge branch 'mabashian-4254-manual-pan-zoom' into release_3.1.0
# Conflicts:
#	awx/ui/client/src/workflow-results/workflow-results.controller.js
2016-12-08 16:14:16 -05:00
Michael Abashian
47d1b142b1 Merge branch '4254-manual-pan-zoom' of https://github.com/mabashian/ansible-tower into mabashian-4254-manual-pan-zoom 2016-12-08 16:10:39 -05:00
Jared Tabor
3a3f7a6f81 Merge pull request #4350 from jaredevantabor/workflow-status-bar
Workflow status bar for completed jobs
2016-12-08 16:08:26 -05:00
Leigh Johnson
c30ac365c3 Fix broken column-sort toggles, add unit test coverage for column-sort toggles, #4268 (#4281) 2016-12-08 15:21:52 -05:00
jaredevantabor
fd61096291 Workflow status bar for completed jobs
adjusting workflow results link for job standard out views

(job results, projects, inventories, and jobs list)

Enhancing workflow status bar for running jobs

removing workflow_events group from the UI

adding comment

fix for updating while job is running

removing pending from the status bar, and reload the page on job finish
2016-12-08 14:57:11 -05:00
Michael Abashian
5666aab601 Tweaked workflow maker node help text based on how many nodes currently exist 2016-12-08 14:16:18 -05:00
Bill Nottingham
bf5479f6ba Tweak comment 2016-12-08 14:06:04 -05:00
Bill Nottingham
2e39070ffd Look at 'ansible_host' for callbacks, not just 'ansible_ssh_host'. 2016-12-08 13:59:23 -05:00
Alan Rominger
26adcf5972 Merge pull request #4321 from AlanCoding/role_filter2
filter.py implementation of RBAC downselection
2016-12-08 12:45:07 -05:00
AlanCoding
2092e67f6f docs and lazy eval for role_level filter 2016-12-08 12:28:46 -05:00
Michael Abashian
0fbd6dde1e Change TOTAL JOBS to TOTAL TEMPLATES in the workflow maker 2016-12-08 12:06:16 -05:00
Michael Abashian
7e571d8ec9 Sanitize JT info popover strings before rending to avoid any monkeys being unnecessarily punched. 2016-12-08 11:42:24 -05:00
Michael Abashian
f7d7e05877 Fixes for some Activity Stream bugs involving the query param changes that I made previously. 2016-12-08 11:25:09 -05:00
kensible
949ccd41b2 Merge pull request #4333 from kensible/4330-i18n-ctint
[Configure TinT] Wrapping strings in i18n
2016-12-08 07:37:59 -05:00