zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-15 06:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,573 Commits 35 Branches 71 Tags
6296e717cb68e1a5aaf879864f25d487e35cd183
Commit Graph

8573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jlmitch5 a974860de6 Merge pull request #2743 from jlmitch5/fixFailedProjectModalWording 
fix text transforming and wording of project failure jt modals
 2016-07-01 11:45:43 -04:00
John Mitchell 4c1456a0f6 fix text transforming and wording of project failure jt modals 2016-07-01 11:30:59 -04:00
Wayne Witzel III c00d32d0eb Merge pull request #2714 from wwitzel3/issue-2706 
ensure the singleton roles show up for sys auditor / sys admins
 2016-07-01 11:11:58 -04:00
Alan Rominger 76d3ae7023 Merge pull request #2740 from AlanCoding/revert_access_list 
Revert "Merge pull request #2444 from AlanCoding/2364_access_list_res…
 2016-07-01 10:56:11 -04:00
jlmitch5 240c57bf4b Merge pull request #2724 from jlmitch5/fixSchedulerUX 
fix scheduler ux of inventory manage to be consistent
 2016-07-01 10:55:40 -04:00
Wayne Witzel III 16bc0cdf0b add helper decorator to ensure signleton roles see the proper role list 2016-07-01 10:38:02 -04:00
AlanCoding 07bea4c8b0 Revert "Merge pull request #2444 from AlanCoding/2364_access_list_restriction" 
This reverts commit b71307bf91d1f1a9337071e04ecced012826584b, reversing
changes made to 1be12482954b680ba7a55746594a7e29df9b178d.
 2016-07-01 10:10:00 -04:00
AlanCoding c7bedcb004 Do not allow creating proejcts as foreign org admin 2016-07-01 09:51:26 -04:00
Leigh Johnson 2df08d8fc6 fix xss vulnerability in notification template test, resolves #2727 2016-07-01 09:02:29 -04:00
Leigh Johnson bc09e42fbe fix xss vulnerability in group count tooltip, resolves #2725 2016-07-01 08:51:30 -04:00
Leigh Johnson 1c49ad4641 fix xss in activity stream, resolves #2731 2016-07-01 08:28:35 -04:00
Akita Noek 2ff5efda3b Merge pull request #2721 from anoek/2710 
Fix inventory update permission so update_role is enough to update
 2016-06-30 21:51:14 -04:00
Jared Tabor 8cd2124d3d adjusting label-delete-modal's title width 
to prevent long strings to run off the modal
 2016-06-30 15:55:29 -07:00
John Mitchell 2b64a1fcd9 fix scheduler ux of inventory manage to be consistent 2016-06-30 16:10:23 -04:00
Jared Tabor 27795e2854 Merge pull request #2722 from jaredevantabor/xss-monkey 
Xss monkey
 2016-06-30 12:59:47 -07:00
Jared Tabor f20fd7d459 Scrubbing delete modals for XSS vulnerabilities 2016-06-30 12:35:55 -07:00
Jared Tabor a0dd159f3b Sanitize JT delete modal in list controller 2016-06-30 12:35:55 -07:00
Chris Meyers ecaf2b86b0 flake8 fix 2016-06-30 15:34:48 -04:00
Akita Noek b21c7e1d15 Fix inventory update permission so update_role is enough to update 2016-06-30 14:58:44 -04:00
Chris Meyers 84e02a5dd2 fix unit tests and make delete last unattach more generic 2016-06-30 14:13:19 -04:00
Chris Meyers 5c5e495e1b Merge pull request #2713 from chrismeyersfsu/fix-supervisor_el6 
increase upstart supervisord script timeout before restarting supervisord
 2016-06-30 13:31:16 -04:00
Akita Noek d79188f865 Cleaned up unit/test_redact.py 2016-06-30 12:16:57 -04:00
Akita Noek 6e022ae183 Broke out URI test helper from test base.py 2016-06-30 12:16:57 -04:00
Akita Noek fa58ca44b1 Ported old/unified_jobs.py 2016-06-30 12:16:57 -04:00
Akita Noek e2c9d26e0d Ported old/views.py 2016-06-30 12:16:57 -04:00
Akita Noek 9742d02ee8 Eliminated redundant http request code in test suite 2016-06-30 12:16:57 -04:00
Akita Noek 172b6b48b4 Ported old redact.py tests 2016-06-30 12:16:57 -04:00
Akita Noek 66f86de3fa Ported old test_licences.py tests 2016-06-30 12:16:57 -04:00
Akita Noek 096a0a262a Ported old/ha.py test 2016-06-30 12:16:57 -04:00
Michael Abashian 5a43f7691b Merge pull request #2700 from mabashian/2685 
Show breadcrumb on group/host edit refresh
 2016-06-30 11:32:41 -04:00
Wayne Witzel III 47893613a2 ensure the singleton roles show up for sys auditor / sys admins 2016-06-30 10:55:54 -04:00
Michael Abashian 1d5cceda08 Tell the breadcrumb directive to ignore this scope as well 2016-06-30 10:07:35 -04:00
Chris Meyers c0ef749c64 Merge pull request #2707 from chrismeyersfsu/fix-label_mixin_ordering 
fix delete last label disassociate
 2016-06-30 09:59:37 -04:00
Leigh Johnson f8659188cb Merge pull request #2703 from leigh-johnson/2689 
Add ng-disabled Groups form save button
 2016-06-30 09:36:57 -04:00
Wayne Witzel III eb0fc15742 Merge pull request #2690 from wwitzel3/test-refactoring 
Adding some coverage for task helpers.
 2016-06-29 21:11:30 -04:00
Wayne Witzel III 5ef385db20 add extra parametrize test and fix indent error 2016-06-29 20:17:59 -04:00
Chris Meyers a57dca9786 fix delete last label disassociate 
* Inherit from mixin first in order to overwrite next inherited class
method, unattach.
* Also, fix up test and add test to ensure correct inheritance
 2016-06-29 17:19:08 -04:00
jlmitch5 b0c899c6ff Merge pull request #2699 from jlmitch5/fixLabelsIssues 
Fix labels issues
 2016-06-29 17:11:35 -04:00
Leigh Johnson c621636d9f add ng-disabled setting to groups form, resolves #2689 2016-06-29 16:29:40 -04:00
Michael Abashian 8fd209c1e7 Fixed bug where breadcrumb was not being shown when refreshing edit group/edit host pages 2016-06-29 15:13:44 -04:00
John Mitchell 9b7c30d383 fix long label name from going outside of delete prompt bounds 2016-06-29 14:50:09 -04:00
John Mitchell 9c42ffa3f6 make wait stop happen after list refresh is called 2016-06-29 14:46:56 -04:00
John Mitchell f39c624b8e get view more to show up after delete 2016-06-29 14:45:17 -04:00
John Mitchell d539a6715c fix xss vulnerability when deleting labels 2016-06-29 14:40:53 -04:00
Matthew Jones 9bd05abcf3 Derive ad-hoc - inventory source notification templates 2016-06-29 13:48:00 -04:00
Wayne Witzel III 32d781175d add and update task unit tests 2016-06-29 12:09:15 -04:00
Wayne Witzel III 479119f3ce add more task unit tests 2016-06-29 12:09:14 -04:00
jlmitch5 fe64b0b478 Merge pull request #2684 from jlmitch5/fixPlaybookNotFound 
fix playbook not found by showing specific error in ui
 2016-06-29 11:49:47 -04:00
Michael Abashian b049dbd9f3 Merge pull request #2686 from mabashian/fix-system-tracking-tooltip 
Fixed system tracking tooltip when there are no hosts
 2016-06-29 11:21:27 -04:00
Leigh Johnson 6a6081dcf7 Merge pull request #2678 from leigh-johnson/2676 
Restyle read-only labels, apply read-only label styles when user cannot edit job template
 2016-06-29 09:23:19 -04:00