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
12,186 Commits 54 Branches 19 Tags
Commit Graph

12186 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Petrello
95ea370e5e add API versioning for /api/v2/ 2017-03-30 15:11:12 -04:00
Bill Nottingham
7dda6106d1 Merge pull request #5910 from wenottingham/fipsing-the-bird 
Use sha1 with hmac.new instead of md5
 2017-03-30 11:00:30 -04:00
Bill Nottingham
a15b67f76b Use sha1 with hmac.new instead of md5 2017-03-27 14:32:27 -04:00
Greg Considine
94a7cf0858 Merge pull request #5816 from gconsidine/general-ux-improvements 
General UX Improvements
 2017-03-27 09:38:17 -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
AlanCoding
49faf212ef consolidate RBAC is_implicit_parent code 2017-03-24 09:25:24 -04:00
AlanCoding
169384ddbe Start RBAC unit testing system to test is_implicit_parent 2017-03-23 15:57:50 -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
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
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
John Mitchell
3b4d40a6c3 update credentials 2017-03-21 10:48:01 -04:00
Ryan Petrello
a69dfced74 Merge remote-tracking branch 'origin/release_3.1.2' into devel 2017-03-21 10:39:16 -04:00
Ryan Petrello
301a088922 Merge pull request #5809 from ryanpetrello/ad_hoc_extra_vars 
show extra_vars in the adhoc results UI, and use them when relaunching
 2017-03-21 10:22:10 -04:00
AlanCoding
925712e3ec block users from making looping filters which can DoS Tower 2017-03-21 10:16:49 -04:00
Greg Considine
1b392a8ad5 Merge pull request #5777 from gconsidine/evaluate-editorconfig 
Add .editorconfig to project root
 2017-03-21 10:02:14 -04:00
Ryan Petrello
ba0e9ab775 copy extra_vars when relaunching ad-hoc commands 
see: #1744
 2017-03-21 09:45:30 -04:00
Ryan Petrello
d0ae818685 show extra variables (if any) in the adhoc command results UI 
see: #1744
 2017-03-21 09:45:25 -04:00
Greg Considine
44775f691b Add correct styling for home dashboard popover 2017-03-21 09:40:13 -04:00
Ryan Petrello
d611fe2971 Merge pull request #5803 from ryanpetrello/fix-5802 
fix a callback bug that causes a task_args leak between job events
 2017-03-20 14:25:59 -04:00
Aaron Tan
fe78d86c4a Merge pull request #5747 from jangsutsr/5728_handle_can_start_without_user_input_cornercase 
Handle can_start_without_user_input cornercase
 2017-03-20 13:03:22 -04:00
Aaron Tan
2e2d88516e Negative functional test added. 2017-03-20 12:21:21 -04:00
Ryan Petrello
6a7743b274 fix a callback bug that causes a task_args leak between job events 
see: #5802
 2017-03-20 12:05:41 -04:00
Michael Abashian
7a8d27bd60 Merge pull request #5734 from mabashian/5340-workflow-tooltip-zindex 
Fix tooltip/link overlay issue on workflow nodes
 2017-03-20 09:55:19 -04:00
Greg Considine
2dfae8857a Add config for more filetypes in .editorconfig 2017-03-17 16:29:33 -04:00