External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-20 06:01:25 -03:30
Code Issues Packages Projects Releases Wiki Activity
14,061 Commits 55 Branches 19 Tags
Commit Graph

14061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello
0929bfb156 Merge pull request #99 from ryanpetrello/fix-7328 
force isolated timeout settings to be positive integers
 2017-07-28 13:44:08 -04:00
Jared Tabor
d44608de30 Merge pull request #95 from jaredevantabor/more-translations 
marking job results and survey maker for translation
 2017-07-28 10:13:28 -07:00
Marliana Lara
672ae8b1de Merge pull request #96 from marshmalien/ux/fix/templates 
[UX] Template and Workflow Editor
 2017-07-28 12:54:19 -04:00
John Mitchell
d678e34a27 update border color from b7 to d7 2017-07-28 12:50:23 -04:00
Marliana Lara
103118b551 Merge pull request #100 from marshmalien/ux/fix/orgs 
Fix UX items related to Organizations
 2017-07-28 12:46:44 -04:00
Ryan Petrello
568986b39f force isolated timeout settings to be positive integers 
see: https://github.com/ansible/ansible-tower/issues/7328
 2017-07-28 12:24:21 -04:00
Marliana Lara
a2563031f8 Fix UX items related to Organizations 2017-07-28 12:09:50 -04:00
Marliana Lara
86fc441d68 Merge pull request #92 from marshmalien/ux/fix/notifications 
[UX] Fix Notification radio buttons and add close button to Toaster alert
 2017-07-28 11:18:18 -04:00
Marliana Lara
e4ddcf74d5 Add translations to popover text 2017-07-28 11:12:33 -04:00
Aaron Tan
7df6fbf0a8 Merge pull request #66 from jangsutsr/3467_move_satellite_ini_config_from_env_to_source_var 
Move Satellite 6 .ini configurations from env variables to source_vars
 2017-07-28 11:07:18 -04:00
Michael Abashian
7ca661cc24 Merge pull request #88 from mabashian/7246-portal-launch-job 
Reload state after launching job from portal or home
 2017-07-28 09:41:11 -04:00
Michael Abashian
87bf10c614 Merge pull request #86 from mabashian/7272-per-page 
Hide view per page when adding users/admins to org
 2017-07-28 09:41:00 -04:00
Michael Abashian
b505211f48 Merge pull request #85 from mabashian/7268-sync-status 
Fixed inventory sync status popover links
 2017-07-28 09:40:38 -04:00
Aaron Tan
f253d2da16 Merge pull request #93 from jangsutsr/7321_prevent_unprivileged_user_from_deleting_is 
Prevent unprivileged users from deleting inventory sources
 2017-07-28 09:39:58 -04:00
Michael Abashian
378e8630e2 Merge pull request #84 from mabashian/7274-pagination 
Fixed first/last pagination controls
 2017-07-28 09:39:41 -04:00
Marliana Lara
723bd66627 Fix UX items related to Job Templates and Workflow Maker 2017-07-28 09:29:32 -04:00
Alan Rominger
368ff8a4fb Merge pull request #71 from AlanCoding/man_overboard 
Set capacity to 0 if instance has not checked in lately
 2017-07-27 20:55:16 -04:00
Jared Tabor
0d7419f5c4 marking job results and survey maker for translation 2017-07-27 15:19:54 -07:00
John Mitchell
8f9b7597ae fix ng-class syntax 2017-07-27 16:56:30 -04:00
Shane McDonald
97b7321920 Cleaning up Makefile 
Removing references to and definitions of unused targets
 2017-07-27 16:46:40 -04:00
Shane McDonald
1b8b6e1159 Remove default goal from makefile 
There is no build target anymore
 2017-07-27 16:32:09 -04:00
Shane McDonald
f3130e06c9 Add i18n flag file back to makefile 
This was accidentally deleted during the repo split
 2017-07-27 16:30:29 -04:00
Aaron Tan
5a540a877e Prevent unprivileged users from deleting inventory sources 2017-07-27 16:29:03 -04:00
AlanCoding
1112557c79 set capacity to 0 if instance has not checked in lately 2017-07-27 16:20:04 -04:00
Aaron Tan
580871a60b Merge pull request #70 from jangsutsr/5913_allow_parsing_null_json_data 
Allow parsing null JSON data
 2017-07-27 16:05:26 -04:00
jlmitch5
62a1a4b785 Merge pull request #91 from jlmitch5/additionalColorsAndBugs 
fix color of schedule forms and bugs found in color audit
 2017-07-27 16:02:57 -04:00
Marliana Lara
a8b7e2608b Merge pull request #76 from marshmalien/ux/fix/permissions-modal 
[UX] Permissions Modal
 2017-07-27 15:40:54 -04:00
Marliana Lara
2a8a178cc5 Merge pull request #68 from marshmalien/ux/fix/projects 
[UX] Fix SCM dropdown text and alertblock css
 2017-07-27 15:40:12 -04:00
Marliana Lara
c0f01e671b Fix UX items related to Notifications 2017-07-27 15:31:39 -04:00
Ryan Petrello
dd16966e09 Merge pull request #77 from ryanpetrello/fix-6116 
filter credential_type__search from related search fields in API v1
 2017-07-27 15:16:17 -04:00
Aaron Tan
b69321a91e Allow parsing null JSON data 2017-07-27 15:14:50 -04:00
John Mitchell
5f58f500cc fix color of schedule forms and bugs found in color audit 2017-07-27 14:49:09 -04:00
Chris Meyers
36f49467c6 Merge pull request #87 from chrismeyersfsu/fix-7069 
trim insights content to only what the UI needs
 2017-07-27 14:13:21 -04:00
Aaron Tan
323d7757dd Move Satellite 6 .ini configurations from env variables to source_vars 2017-07-27 14:08:07 -04:00
Chris Meyers
f20f4f40a0 trim insights content to only what the UI needs 2017-07-27 13:58:54 -04:00
Wayne Witzel III
6856c77a8e Merge pull request #89 from wwitzel3/release_3.2.0 
Backout the token websocket changes, can of worms.
 2017-07-27 13:16:14 -04:00
Chris Meyers
18aad9dc98 Merge pull request #75 from chrismeyersfsu/fix-6083 
make password survey field behave like text field
 2017-07-27 13:06:16 -04:00
Chris Meyers
1d0e125aad make password survey field behave like text field 
related to https://github.com/ansible/ansible-tower/issues/6083
 2017-07-27 12:57:31 -04:00
Jared Tabor
480a2f5a85 Merge pull request #83 from jaredevantabor/7286-security 
making request for inventory information
 2017-07-27 09:49:57 -07:00
Ryan Petrello
53700c10b9 Merge pull request #90 from ryanpetrello/fix-7320 
fix a few activity stream bugs related to setting creation/update
 2017-07-27 12:02:28 -04:00
Ryan Petrello
60da24d82f fix a few activity stream bugs related to setting creation/update 
* when a setting is created, only create *one* activity stream record
  for the creation, not one for create and another for update (similar
  to https://github.com/ansible/tower/pull/53)
* add code to hide `$encrypted$` activity stream content

see: https://github.com/ansible/ansible-tower/issues/7320
 2017-07-27 11:51:10 -04:00
Shane McDonald
c8b0142929 Fix test failures 2017-07-27 11:39:00 -04:00
Wayne Witzel III
5d167cafa2 Revert "Merge pull request #39 from wwitzel3/issue-7260" 
This reverts commit 6cd059278184bc1693320ad7e4403d08d1457def, reversing
changes made to 943a40eb40817a3c4d28bfb11d2acca0dae277ce.
 2017-07-27 11:32:09 -04:00
mabashian
846cba285c Reload state after launching job from portal or home 2017-07-27 10:40:06 -04:00
mabashian
8e8a4c84f5 Hide view per page when adding users/admins to org 2017-07-27 10:20:14 -04:00
mabashian
7f175a2f56 Fixed inventory sync status popover links 2017-07-27 10:11:32 -04:00
mabashian
c6d675449b Fixed first/last pagination controls 2017-07-27 09:29:20 -04:00
Aaron Tan
c3f2a8a140 Merge pull request #81 from jangsutsr/6344_enforce_extra_vars_override_hierachy 
Enforce extra_vars override hierachy
 2017-07-27 09:21:25 -04:00
Michael Abashian
fde3e41042 Merge pull request #78 from mabashian/7266-run-commands 
Maintain selected host/group rows on pagination and search changes
 2017-07-27 08:54:40 -04:00
Michael Abashian
453a418ee3 Merge pull request #74 from mabashian/7299-pmrun 
Fix privilege escalation password label on launch
 2017-07-27 08:54:01 -04:00