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

12954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Considine
94a7cf0858 Merge pull request #5816 from gconsidine/general-ux-improvements 
General UX Improvements
 2017-03-27 09:38:17 -04:00
Wayne Witzel III
18eaacf4bb create _survey_element_validation and use it for updating extra_vars 2017-03-24 17:57:52 -04:00
Wayne Witzel III
c99d4659da Do not set the default if the field was not passed in to kwargs_extra_vars 2017-03-24 16:59:43 -04:00
Michael Abashian
1cb7fd9171 Merge pull request #5887 from mabashian/5883-job-results-event-json 
Host Event json should be read-only
 2017-03-24 13:11:38 -04:00
Alan Rominger
d2795c4784 Merge pull request #5434 from AlanCoding/activity_hygiene 
avoid multi-field implicit role activity stream entries
 2017-03-24 12:26:32 -04:00
Aaron Tan
b6ccb01257 Merge pull request #5888 from jangsutsr/5628_remove_log_aggregator_port_required_mark 
Remove log aggregator port required mark
 2017-03-24 12:11:42 -04:00
Aaron Tan
b421670c10 Remove log aggregator port required mark. 2017-03-24 11:57:56 -04:00
Shane McDonald
fd3daa5b21 Merge pull request #5882 from shanemcd/setup-subpackage 
Setup subpackage
 2017-03-24 11:53:19 -04:00
Aaron Tan
7ba79c1027 Merge pull request #5792 from jangsutsr/5628_smarter_log_aggregator_host_name_generation 
Smarter log aggregator host name generation
 2017-03-24 11:46:46 -04:00
Aaron Tan
07e7e4cfd0 Modify according to review feedback. 2017-03-24 11:35:45 -04:00
Ryan Petrello
d52726592f Merge pull request #5846 from ryanpetrello/fix-5691 
property filter `no_log` for item event loops
 2017-03-24 11:04:29 -04:00
Michael Abashian
c67687acfd Host Event json should be read-only 2017-03-24 10:35:08 -04:00
AlanCoding
49faf212ef consolidate RBAC is_implicit_parent code 2017-03-24 09:25:24 -04:00
Shane McDonald
0e2a2d61e2 Create a setup subpackage 2017-03-23 16:46:25 -04:00
Shane McDonald
114340753d Merge pull request #5875 from shanemcd/ui-subpackage 
Server and UI subpackages
 2017-03-23 16:45:55 -04:00
AlanCoding
169384ddbe Start RBAC unit testing system to test is_implicit_parent 2017-03-23 15:57:50 -04:00
Michael Abashian
4412a9e034 Merge pull request #5873 from mabashian/5850-job-launch-multi-select 
Add validation to the multi-select questions in survey
 2017-03-23 14:03:51 -04:00
Michael Abashian
37bfa3c3a8 Add validation to the multi-select questions in survey 2017-03-23 11:24:52 -04:00
Greg Considine
6b6cf9aecc Adjust BEM naming of portal component 2017-03-23 09:42:22 -04:00
Alan Rominger
a5d23e7c80 Merge pull request #5851 from AlanCoding/vars_and_words 
Always word the variables parsing error the same way
 2017-03-22 18:45:29 -04:00
Bill Nottingham
22c4cd444a add changelog 2017-03-22 16:57:59 -04:00
AlanCoding
99fc0e8264 Use consistent error message when vars are not parsed correctly 2017-03-22 16:37:20 -04:00
AlanCoding
bb292f817b move check for implicit parent role into fields.py 2017-03-22 16:30:15 -04:00
AlanCoding
b01b12ab2a avoid multi-field implicit role activity stream entries 2017-03-22 15:22:48 -04:00
Michael Abashian
b5ae83845e Merge branch 'mabashian-inject-dependency-audit' into devel 2017-03-22 11:24:43 -04:00
Michael Abashian
1c73cbdf48 Merge branch 'inject-dependency-audit' of https://github.com/mabashian/ansible-tower into mabashian-inject-dependency-audit 
# Conflicts:
#	awx/ui/client/src/activity-stream/factories/show-detail.factory.js
#	awx/ui/client/src/activity-stream/factories/stream.factory.js
#	awx/ui/client/src/credentials/add/credentials-add.controller.js
#	awx/ui/client/src/credentials/edit/credentials-edit.controller.js
#	awx/ui/client/src/credentials/list/credentials-list.controller.js
#	awx/ui/client/src/inventories/edit/inventory-edit.controller.js
#	awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js
#	awx/ui/client/src/organizations/edit/organizations-edit.controller.js
#	awx/ui/client/src/organizations/linkout/addUsers/addUsers.controller.js
#	awx/ui/client/src/organizations/linkout/addUsers/addUsers.directive.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-admins.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-teams.controller.js
#	awx/ui/client/src/organizations/linkout/controllers/organizations-users.controller.js
#	awx/ui/client/src/teams/add/teams-add.controller.js
#	awx/ui/client/src/teams/list/teams-list.controller.js
#	awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
#	awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
#	awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
#	awx/ui/client/src/users/add/users-add.controller.js
#	awx/ui/client/src/users/edit/users-edit.controller.js
#	awx/ui/client/src/users/list/users-list.controller.js
 2017-03-22 11:24:03 -04:00
Ryan Petrello
f9b5b9aa91 property filter no_log for item event loops 
see: #5691
 2017-03-22 11:15:33 -04:00
Michael Abashian
5907b3dcad Merge pull request #5801 from mabashian/job-results-search 
Fixed bug when search job_events with key:value
 2017-03-21 17:39:15 -04:00
Greg Considine
7d4b3a08f2 Remove inner border on toggles 2017-03-21 13:39:05 -04:00
Greg Considine
10a51c72f0 Add toggle switch for YAML,JSON selection 2017-03-21 11:43:39 -04:00
jlmitch5
722f09357d Merge pull request #5606 from jlmitch5/cleanupOtherResources 
Update Resource Modules
 2017-03-21 11:30:10 -04:00
Shane McDonald
fac387dae6 Merge pull request #5813 from shanemcd/fix-bundle-installer 
Include postgresql-server in bundled repos
 2017-03-21 11:02:02 -04:00
John Mitchell
455d91fa0e fix workflow edit controller di 2017-03-21 10:53:32 -04:00
Alan Rominger
83bc654b15 Merge pull request #5812 from AlanCoding/no_loops_for_hackers 
Block loops in querystring filters
 2017-03-21 10:50:35 -04:00
John Mitchell
367943fa3c fix org list 2017-03-21 10:49:28 -04:00
John Mitchell
bc5e275694 fix app js module entrypoint 2017-03-21 10:49:28 -04:00
John Mitchell
1b33e531cf add i18n back into job template form 2017-03-21 10:49:28 -04:00
John Mitchell
73ec664d53 fix the rest of the forms 2017-03-21 10:49:28 -04:00
John Mitchell
d52739d04e cleaned up the rest of the lists 2017-03-21 10:49:28 -04:00
John Mitchell
434d14b428 remove unused lists and forms 2017-03-21 10:49:28 -04:00
John Mitchell
46aaed6c65 fix jshint error 2017-03-21 10:49:28 -04:00
John Mitchell
7541244354 remove org form and list def reference from app.js 2017-03-21 10:49:28 -04:00
John Mitchell
1db4a288bc fix jshint error 2017-03-21 10:49:28 -04:00
John Mitchell
b3e7102e02 cleanup orgs 2017-03-21 10:49:28 -04:00
John Mitchell
9bc217ec8d cleanup workflows 2017-03-21 10:49:27 -04:00
John Mitchell
e784dba612 cleanup activity stream 2017-03-21 10:48:01 -04:00
John Mitchell
a6c57fc060 cleanup schedules 2017-03-21 10:48:01 -04:00
John Mitchell
a548aa72e0 cleanup users 2017-03-21 10:48:01 -04:00
John Mitchell
8688e3c6a1 cleanup teams 2017-03-21 10:48:01 -04:00
John Mitchell
f74f866b81 remove TeamHelper from messed up merge conflict fix 2017-03-21 10:48:01 -04:00