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

10609 Commits

Author SHA1 Message Date
Chris Meyers
bf4f29ab6a Merge pull request #4524 from chrismeyersfsu/fix-4365
organization pattern differs from other views through the use of
2016-12-20 15:38:33 -05:00
Chris Meyers
f5ccdde508 pip prefers - not _ 2016-12-20 15:15:10 -05:00
Chris Meyers
97fccd32d8 organization pattern differs from other views through the use of
partials. Stick with this one-off and just patch up the wrongly nested
smart-search / List-well divs.
2016-12-20 14:30:58 -05:00
Jared Tabor
ba3054eb8c Merge pull request #4517 from jaredevantabor/aw-feature-fix
Adding the featureConfig promise to the feature directive
2016-12-20 08:52:46 -08:00
Chris Meyers
6373642a67 explicitly install ssl backport for gce libcloud 2016-12-20 11:08:51 -05:00
jaredevantabor
8e71705c39 adding the featureConfig promise to the feature directive
to prevent any race conditions
2016-12-19 15:59:09 -08:00
Jake McDermott
131eb3832a fix typo in configuration-auth.controller.js (#4516)
GithHub -> GitHub
2016-12-19 18:00:06 -05:00
Alan Rominger
1fb3986889 Merge pull request #4495 from AlanCoding/ex_perm
Switch WFJT node permissions to execute and use levels
2016-12-19 17:27:45 -05:00
Chris Meyers
46049877a5 Merge pull request #4513 from chrismeyersfsu/fix-4362
only print dep warn for rax
2016-12-19 17:20:41 -05:00
Chris Meyers
fa9e1222af Merge pull request #4512 from chrismeyersfsu/feature-vmware_new
Feature vmware new
2016-12-19 17:15:35 -05:00
Chris Meyers
d985f07838 use vmware uuid that is most unique 2016-12-19 17:12:52 -05:00
Chris Meyers
dbef3b7571 update vmware inv sync unique instance id 2016-12-19 17:10:56 -05:00
Chris Meyers
2f9a5409c3 code logic fix and vmware active var updated 2016-12-19 17:08:27 -05:00
Chris Meyers
139d80bcbb deps for new vmware inv script 2016-12-19 17:03:18 -05:00
Chris Meyers
4e71690bf3 only print dep warn for rax 2016-12-19 16:55:57 -05:00
Jared Tabor
75545ef5f9 Merge pull request #4488 from jaredevantabor/elapsed-time
adding elapsed time for a running job
2016-12-19 13:48:25 -08:00
Chris Meyers
b72a148cbc vmware_inventory dyn inv script support 2016-12-19 16:39:10 -05:00
Jared Tabor
e918f96462 Merge pull request #1 from jlmitch5/elapsed-time
fixed job results controller unit tests w moment dep
2016-12-19 13:35:23 -08:00
John Mitchell
fc4c16465a fixed job results controller unit tests w moment dep 2016-12-19 15:51:46 -05:00
jaredevantabor
bd95aebe36 more unit test code that doens't work and fixing jshint 2016-12-19 11:42:48 -08:00
jaredevantabor
5de93aa05c removing reload call when a job ends from the socket listener
on the job results page
2016-12-19 11:37:17 -08:00
Michael Abashian
6de2518c53 Merge pull request #4317 from leigh-johnson/3487
Assign batch resource permissions to users/teams
2016-12-19 13:31:51 -05:00
Ken Hoes
9b98f262ac Fixed infinite wait spinner when deleting projects 2016-12-19 13:21:12 -05:00
jaredevantabor
439b699e73 adding moment for unit tests, but they're still failing :( 2016-12-19 10:09:22 -08:00
jaredevantabor
186c065484 adding elapsed time for a running job 2016-12-19 10:09:22 -08:00
Chris Meyers
2f98716c0b Merge pull request #4493 from chrismeyersfsu/fix-3954
fix license not found err msg
2016-12-19 13:01:09 -05:00
Michael Abashian
94ae1fcc94 Merge pull request #4494 from mabashian/4252-dashboard-hosts-edit
Fixed dashboard hosts edit
2016-12-19 12:30:47 -05:00
Michael Abashian
a5f275bcca Fix for adding batch permissions to teams. Also added logic to properly enable/disable the save button on this modal. 2016-12-19 12:27:41 -05:00
jlmitch5
c48a2cad2e Merge pull request #4499 from jlmitch5/fixUiUnitTests
fixed job results controller test get labels function
2016-12-19 12:07:14 -05:00
James Laska
0dfbc0a30e Merge pull request #4498 from jlaska/request_configuration
Rewrite request_tower_configuration.sh
2016-12-19 12:02:33 -05:00
Chris Meyers
192e214b6e Merge pull request #4496 from chrismeyersfsu/enhancement-foreman_bump
bump foreman and expose new grouping features
2016-12-19 12:01:17 -05:00
James Laska
7bb2021337 Fixed typo in -h output 2016-12-19 11:58:28 -05:00
John Mitchell
df7b2ce4bc fixed job results controller test get labels function 2016-12-19 11:56:00 -05:00
James Laska
e27c117256 Rewrite request_tower_configuration.sh
Adds proper getopts support and usage. Remove the retry logic, since it
would *never* retry given existing conditional checks.

Connect #3923
2016-12-19 11:46:40 -05:00
Bill Nottingham
291dca0954 Merge pull request #4482 from wenottingham/dadgumit
Fix env var.
2016-12-19 11:40:55 -05:00
Chris Meyers
1c4e6c55f5 bump foreman and expose new grouping features
related to #3467
related to #5226
related to #4373
2016-12-19 11:26:43 -05:00
AlanCoding
4b57aa238a switch WFJT node permissions to execute and use levels 2016-12-19 11:21:45 -05:00
Michael Abashian
0ba47c1246 Fixed dashboard hosts edit 2016-12-19 10:40:40 -05:00
Chris Meyers
a95880b60a fix license not found err msg 2016-12-19 10:39:28 -05:00
jaredevantabor
4f9d2fbde3 adding moment as a dependency for workflow chart directive
it was throwing a console error
2016-12-16 13:44:54 -08:00
Chris Meyers
afe7293118 remove uneeded print 2016-12-16 15:52:25 -05:00
Michael Abashian
7086f4b0fc Merge pull request #4486 from mabashian/4270-org-inv-proj-sublists
Fixed bug where organization inventory/project lists were not being rendered
2016-12-16 15:40:38 -05:00
Chris Meyers
d550f6153a more jenkins removal fixes 2016-12-16 14:43:20 -05:00
Chris Meyers
304fcbe945 requirements jenkins is no longer a thing 2016-12-16 14:29:57 -05:00
jlmitch5
bd18be06df Merge pull request #4441 from jlmitch5/fixJobResults
Fix job results
2016-12-16 14:13:02 -05:00
jlmitch5
55e4e9efb6 Merge branch 'release_3.1.0' into fixJobResults 2016-12-16 14:12:52 -05:00
jlmitch5
615996f3db Merge pull request #4485 from jlmitch5/disabledExtravars
Mad extravars look disabled
2016-12-16 13:32:41 -05:00
Alan Rominger
4bf6eb4f98 Merge pull request #4484 from AlanCoding/service_identity
Feed the service_identity module
2016-12-16 13:32:17 -05:00
Michael Abashian
43ff3fec76 Merge pull request #4478 from mabashian/4274-system-jobs-notifications
Fixed system jobs notifications route
2016-12-16 13:28:29 -05:00
Michael Abashian
ff1e9f728a Merge pull request #4464 from mabashian/4229-edit-recently-used
Fixed recently used job templates edit link
2016-12-16 13:28:00 -05:00