8678 Commits

Author SHA1 Message Date
AlanCoding
f19088db1b fix job_type change 500 error, patch up runtime tests 2016-05-18 09:24:33 -04:00
Michael Abashian
4eeea9ab0d Removed urls declaration - this bug was fixed upstream 2016-05-17 15:55:43 -04:00
Michael Abashian
d1e6a3323d Job launch ui overhaul 2016-05-17 15:50:56 -04:00
Matthew Jones
9ba98d9cac Rename channels to rooms for hipchat notifications 2016-05-17 15:33:22 -04:00
John Mitchell
9d1a3e065a styling fixes to dashboard and tag search 2016-05-17 14:24:12 -04:00
Wayne Witzel III
2e4c26a77f remove the ORing of local roles, check against organization roles 2016-05-17 13:56:11 -04:00
Akita Noek
3347bcac79 Merge pull request #1942 from anoek/cowsay
Fixed our beloved cow
2016-05-17 11:59:00 -04:00
Akita Noek
e9ea791a85 Brand that cow! 2016-05-17 11:47:49 -04:00
Wayne Witzel III
ddc8f73b63 move related roles UnifiedJobTemplate -> JobTemplate 2016-05-17 11:29:26 -04:00
AlanCoding
a7fed53efc implement a default ordering for ActivityStream 2016-05-17 11:24:13 -04:00
Akita Noek
9026d02be2 Fixed our beloved cow 2016-05-17 11:06:58 -04:00
AlanCoding
9cc8ae9329 ActivityStream access checking test for most resources 2016-05-17 10:39:38 -04:00
Matthew Jones
430b548395 Exclude the job template limit during callback
This causes some unexpected behavior when commas instead of colons are
used during the job template limit due to a bug in ansible.  It has the
effect of expanding the number of hosts that it will run on instead of
just one which is what we are expecting
2016-05-17 10:35:14 -04:00
Akita Noek
3862d6d1be Merge pull request #1935 from anoek/1929
Fix project update permissions
2016-05-17 10:15:20 -04:00
Alan Rominger
863105435e Merge pull request #1871 from AlanCoding/1868_org_cts_sublist
Add organization resource cts. in sublists
2016-05-17 09:58:44 -04:00
AlanCoding
4e2e4667de test for activity stream selective access 2016-05-17 09:06:08 -04:00
AlanCoding
f805f43eaa new fixtures for activity stream tests 2016-05-17 09:06:07 -04:00
AlanCoding
c8863a10b1 add access filters to the ActivityStream list 2016-05-17 09:06:07 -04:00
Akita Noek
b2d7918912 Merge pull request #1924 from anoek/devel
Turn off activity stream flag in the UI if we have it explicitly disabled in our settings file
2016-05-17 09:02:59 -04:00
Akita Noek
802a112106 Fixed project update permissions
Now folks in the update role can update a project as intended, yay!

 #1929
2016-05-17 09:01:17 -04:00
Akita Noek
98412b52f2 Handle non-existent license data in config view 2016-05-16 16:34:01 -04:00
Akita Noek
a532e63539 Merge pull request #1931 from anoek/1919
Implemented team role removal
2016-05-16 16:25:45 -04:00
Akita Noek
2c652a7375 Typo 2016-05-16 16:14:53 -04:00
Akita Noek
a828e8b005 Implemented team role removal
Also threw in the little fa-users icon when it's a permission coming from a team

 #1919
2016-05-16 15:21:04 -04:00
Akita Noek
f1e92719e7 Merge pull request #1923 from anoek/1791
Hide AS/Dashboard button for basic licenses
2016-05-16 14:54:58 -04:00
Shane McDonald
dfa85dbbd2 Merge pull request #1896 from shanemcd/expiration-date
*Really* display correct expiration date on license page.
2016-05-16 14:43:45 -04:00
jlmitch5
3bb407b39c Merge pull request #1911 from jlmitch5/addUsersOrg
modal to add users and admins to organizations
2016-05-16 14:21:06 -04:00
John Mitchell
4c1b25ea58 allow basepath to contain query parameter when adding search tags 2016-05-16 14:20:19 -04:00
John Mitchell
18e3552c86 make org related lists searchable on the correct base 2016-05-16 13:45:34 -04:00
Ken Hoes
cc583882ee Password fields one line, direct URL access for User edit 2016-05-16 11:31:58 -04:00
Akita Noek
2435de6261 Merge pull request #1925 from anoek/1692
Fixed duplicate entries in active_roles (again)
2016-05-16 11:23:58 -04:00
kensible
b9d654690a Merge pull request #1891 from kensible/1830-credentialsAudit
Credential UX audit cleanup
2016-05-16 11:17:09 -04:00
Akita Noek
06eb13a104 Fixed duplicate users in access_list
Uhg.
2016-05-16 10:52:41 -04:00
Akita Noek
ac5bc2aaba Fixed duplicate entries in active_roles (again)
#1692
2016-05-16 10:49:34 -04:00
Akita Noek
a2cc2927e6 Turn off activity stream flag in the UI if we have it explicitly disabled in our settings file 2016-05-16 10:38:22 -04:00
Akita Noek
01e01fdb82 Hide AS/Dashboard button for basic licenses
#1791
2016-05-16 10:28:40 -04:00
Alan Rominger
4919eff769 Merge pull request #1837 from AlanCoding/1826_job_runtime_validation
Protect against special scan job cases in job runtime validation
2016-05-16 09:51:33 -04:00
Ken Hoes
7361b8cef3 Fixed unrelated jshint errors 2016-05-16 09:44:11 -04:00
Chris Meyers
666e8fff92 Merge pull request #1920 from chrismeyersfsu/fix-supervisord
fix supervisord issue
2016-05-13 15:54:34 -04:00
Chris Meyers
f9d0c74bbc fix supervisord issue
* exec spawned python process so we don't have grandparents
* increase time until supervisord is killed
2016-05-13 15:41:46 -04:00
Akita Noek
8bcab8e748 Merge pull request #1915 from anoek/doc-updates
RBAC doc updates
2016-05-13 13:57:22 -04:00
Wayne Witzel III
1e16482809 Merge pull request #1913 from wwitzel3/issue-1884
Consolidate roles and re-structure auditor children.
2016-05-13 13:11:14 -04:00
Akita Noek
60f76de5c3 RBAC doc updates 2016-05-13 12:01:54 -04:00
Wayne Witzel III
599902da47 update api view/serializers for new role names 2016-05-13 12:00:33 -04:00
Wayne Witzel III
da12da2a05 test fixes for new role names 2016-05-13 11:59:18 -04:00
Wayne Witzel III
911c92707c update models to match new migrations 2016-05-13 11:59:14 -04:00
Wayne Witzel III
6a6194cc43 update migrations for RBAC 2016-05-13 11:59:12 -04:00
Wayne Witzel III
1da2727f5d add can_admin for CustomInventoryScripts 2016-05-13 11:59:05 -04:00
John Mitchell
1bedc5dacc modal to add users and admins to organizations 2016-05-13 10:58:36 -04:00
Matthew Jones
ae4cfc98ce Update to house's latest legacy azure inv script 2016-05-13 10:47:18 -04:00