External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
11,049 Commits 54 Branches 19 Tags
Commit Graph

11049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Abashian
4e62fe084e Fixed unit test failures 2017-01-23 16:43:12 -05:00
jlmitch5
13cc854a15 Merge pull request #4864 from jlmitch5/jobResultsPerformance2 
more updates to job results performance
 2017-01-23 16:42:35 -05:00
Matthew Jones
b3f4f3bea5 Fix issue reassembling ad-hoc event partials 2017-01-23 16:30:44 -05:00
Matthew Jones
8e2342b7c2 Merge pull request #4881 from matburt/nginx_alt_port 
Implement alternate ports for nginx
 2017-01-23 16:16:51 -05:00
John Mitchell
437f312026 fix jshint error 2017-01-23 16:01:54 -05:00
Ryan Petrello
5253634c72 Merge pull request #4884 from ryanpetrello/release_3.1.0 
fix an LDAP settings bug which can cause LDAP auth to fail
 2017-01-23 15:56:00 -05:00
Chris Meyers
5930fb1a10 Merge pull request #4870 from chrismeyersfsu/fix-4789 
tooltip location
 2017-01-23 15:44:39 -05:00
Michael Abashian
ce5ac04d97 Merge pull request #4867 from mabashian/4856-delete-wf-node 
Fixed stale workflow node data issue
 2017-01-23 15:42:40 -05:00
Ryan Petrello
40a5c6cc0b fix an LDAP settings bug which can cause LDAP auth to fail 
django-ldap-auth expects the "unset/empty" state of certain LDAP DN
settings (such as AUTH_LDAP_REQUIRE_GROUP and
AUTH_LDAP_USER_DN_TEMPLATE) to be NULL/None (not an empty string).

Resolves #4678
 2017-01-23 15:35:23 -05:00
Jared Tabor
5036416491 Merge pull request #4819 from jaredevantabor/autopopulate-lookups 
Autopopulate lookups
 2017-01-23 12:33:14 -08:00
Shane McDonald
1cac3abc9f Whitespace fix in translation 2017-01-23 14:50:35 -05:00
Matthew Jones
8a9b2fcaea Implement alternate ports for nginx 
* This also allows disabling https mode in the nginx configuration
* Reconfigure the development container to not specifically require
  https, so the haproxy cluster configuration can work
 2017-01-23 14:34:15 -05:00
Shane McDonald
483fbb6f24 Pull in latest translations 2017-01-23 12:25:57 -05:00
Shane McDonald
b60b4b2bc1 Generate .mo files without django, enable API l10n at build time. 2017-01-23 12:25:56 -05:00
Shane McDonald
933512be63 Revert "Manually add .mo files (for now) to get API l10 working." 
This reverts commit 3acb71784fdcaff34644b31fc1bdf4914229c503.

# Conflicts:
#	awx/locale/fr/LC_MESSAGES/ansible-tower-ui.mo
 2017-01-23 12:25:56 -05:00
Chris Meyers
1f0733b31a tooltip location 
related to #4789
 2017-01-23 11:35:33 -05:00
Michael Abashian
5cf7b0d7a5 Merge pull request #4868 from mabashian/3620-can_edit 
Removed ScanJobs list - no longer used.
 2017-01-23 11:25:22 -05:00
Michael Abashian
bfa099d80a Removed ScanJobs list - no longer used. 2017-01-23 11:13:52 -05:00
Michael Abashian
9550564d5d Merge pull request #4859 from mabashian/1104-fix-back-button-search 
Fix for smart search back/forward browser page navigation
 2017-01-23 11:11:54 -05:00
Michael Abashian
f0dc841aea Fixed stale workflow node data issue 2017-01-23 10:58:00 -05:00
Matthew Jones
df249eda2e Raise default job event worker queue size 2017-01-23 10:47:47 -05:00
Shane McDonald
8f804b9da8 Merge pull request #4845 from sundeep-co-in/release_3.1.0 
update zanata config for 3.1.0 release
 2017-01-23 10:44:18 -05:00
jaredevantabor
250340e063 Fix for filtering organizations, and fixing the org lookup on credentials form 2017-01-20 17:50:24 -08:00
jaredevantabor
6c7c4061d1 When a user types into a lookup field, we now only match against objects 
the user has permission to access. I also included the type of thing it was.
So for instance, if you're typing into cloud credentials, it should validate
against cloud credentials, instead of validating against all credentials.
 2017-01-20 16:33:50 -08:00
jaredevantabor
862a2d3c49 incorporating RBAC into auto-population and for lookup modal lists 
basically, you shouldn't be able to select a resource you don't have permission to use, either through autopopulation or selecting manually
 2017-01-20 15:45:00 -08:00
John Mitchell
55034f1a78 updates to job results performance 2017-01-20 17:41:09 -05:00
Jared Tabor
8cfa8c30e7 Merge pull request #4855 from jaredevantabor/ssl-tls-radios 
Stacking ssl/tls radio buttons on notification templates form
 2017-01-20 14:01:16 -08:00
Chris Church
41553c879c Make AWX_PROOT_HIDE_PATHS, AWX_PROOT_SHOW_PATHS and AWX_ANSIBLE_CALLBACK_PLUGINS not required. 2017-01-20 16:02:33 -05:00
Chris Meyers
d81194f791 Merge pull request #4858 from chrismeyersfsu/fix-4857 
allow overriding chkbox ngDisable inheritance
 2017-01-20 15:59:07 -05:00
Michael Abashian
c98cf49ff2 Fix for smart search back/forward browser page navigation 2017-01-20 15:29:15 -05:00
Chris Meyers
a59da9115e allow overriding chkbox ngDisable inheritance 
Allow checkbox associated with form textbox to override the enherited
ngDisabled condition set on the associated "parent" form textbox.

This allows "Ask at Runtime?" checkboxes to be unchecked.

Note: I did not expand this feature to anything outside the scope of
fixing this problem. i.e. only password textbox fields.

related to #4857
 2017-01-20 14:33:42 -05:00
Chris Meyers
e3dad92a05 Merge pull request #4852 from chrismeyersfsu/fix-3967 
center the red and green balls
 2017-01-20 13:57:23 -05:00
jaredevantabor
857780b0c3 Stacking ssl/tls radio buttons on notification templates form 2017-01-20 10:01:02 -08:00
Jared Tabor
037d8a1ee4 Merge pull request #4842 from jaredevantabor/sync-icon 
removing project sync status from job results if project was a manual…
 2017-01-20 08:24:46 -08:00
Chris Meyers
be3ff85500 center the red and green balls 
related to #3967
 2017-01-20 11:15:04 -05:00
Chris Meyers
5afa2ab264 Merge pull request #4754 from chrismeyersfsu/fix-4342 
download standard out tooltip
 2017-01-20 10:06:36 -05:00
Michael Abashian
b2b18dd958 Merge pull request #4841 from mabashian/4768-search-keys-parentheses 
Fixed regex that was breaking on parenthesis
 2017-01-20 10:05:52 -05:00
Chris Meyers
e2a13495c8 formatting and i18n fixes 2017-01-20 09:53:17 -05:00
Michael Abashian
72e4ac8c66 Added unit test cases to cover parenthesis in search tags 2017-01-20 09:53:04 -05:00
Ryan Petrello
2b4cede9ac Merge pull request #4824 from ryanpetrello/host-extra-vars 
Fix non-prettified extra vars on the Hosts Edit UI.
 2017-01-20 09:15:04 -05:00
sundeep-co-in
03c774e968 update zanata config 2017-01-20 18:10:43 +05:30
jaredevantabor
8339a9cbf3 removing project sync status from job results if project was a manual project 2017-01-19 17:11:59 -08:00
Michael Abashian
095a9bf84d Fixed regex that was breaking on parenthesis 2017-01-19 19:45:58 -05:00
jaredevantabor
fc45603c3b adding three fixes: 
1. adding a watcher for the basePath to use for lookups that might
have dynamic lookups. Ex: The groups form -> cred depends on "source.type"

2. adding a fix for RBAC based autopopulation. Basically, if you don't have
permission to "use" something, then you shouldn't be able to see it auto-fill

3. adding a fix for the promptable fields on the job template form. The inventory
and credential are both promptable, and therefore should not auto populate
 2017-01-19 15:58:35 -08:00
Michael Abashian
a13d2ca4bb Fixed alignment issue with the download standard out tooltip when the output is too big. 2017-01-19 18:49:43 -05:00
Shane McDonald
9cb47bfa73 Merge pull request #4831 from jlmitch5/fixFrenchTranslation 
fix french translation issues
 2017-01-19 15:55:24 -05:00
Shane McDonald
ad4323ebb8 Update French .mo file 2017-01-19 15:54:58 -05:00
John Mitchell
baabc3e418 also fix the one not found in api po 2017-01-19 14:10:48 -05:00
John Mitchell
ee3d8466b8 fix the issues present in api po in ui po as well 2017-01-19 14:09:33 -05:00
John Mitchell
ee3919416c fix french translation issues 2017-01-19 14:03:01 -05:00