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
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
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
Leigh
89bd66f1f6
Schedules - audit, bugs, allow HH:MM:SS end time granularity ( #1857 )
...
* cleanup unused code artifacts #1851
* fix bug found during audit where empty extra_data was being POSTd as null, #1593
* cleanup schedule helper #1851 , update angular-scheduler dependency, automatically set end dt to start dt + 1 day in schedule > add, add hh:mm:ss end date grandularity, resolves #1758 , resolves #1856 '
* clean up dead schedule dependencies #1851
* fix extra vars in schedule > edit view, fix munge of nested yaml, resolves #1547
squash
* update angular-scheduler to v0.0.19
* re-add ng-toast dependency to bower manifest
2016-05-13 10:43:07 -04:00
Akita Noek
1e26df639f
Merge pull request #1909 from anoek/devel
...
Filled in RBAC descriptions
2016-05-13 10:32:59 -04:00
Akita Noek
6958e81d00
Filled in RBAC descriptions
...
#1655
2016-05-13 10:11:38 -04:00
Wayne Witzel III
542d3d22b2
Merge pull request #1889 from wwitzel3/issue-1881
...
remove URL and add roles endpoint for JobTemplate
2016-05-13 09:16:37 -04:00
Akita Noek
6d871afd4a
Merge pull request #1904 from anoek/migration-fixes
...
Job template migration fixes
2016-05-12 16:33:24 -04:00
Akita Noek
9d46a39e42
Added comment context to caught exception
2016-05-12 16:31:32 -04:00
Chris Meyers
7c46d7e749
Merge pull request #1906 from chrismeyersfsu/fix-httpd_error
...
best effort disable httpd
2016-05-12 15:43:46 -04:00
Chris Meyers
11090af095
Merge pull request #1905 from chrismeyersfsu/fix-mongo_performance3
...
optimize transformation
2016-05-12 15:43:13 -04:00
Matthew Jones
a79c53bb17
Switch to disabling sftp batch instead of scp
...
For ad-hoc jobs where we are experiencing issues related to disabling
control persist to support proot. See commit
f69846e7871cae41b19ecda33563d6365dc9c3e0 for earlier analysis
2016-05-12 15:33:58 -04:00
Chris Meyers
fbca7e70f1
optimize transformation
2016-05-12 14:16:39 -04:00
Akita Noek
acc49bbbef
Fixed up JT migration tests
2016-05-12 13:46:13 -04:00
Akita Noek
27457239bc
Fixed up job template migrations
...
Massive speed improvement as well as made it not wrong (or at least less wrong).
2016-05-12 13:43:36 -04:00
Akita Noek
4378430c4f
Minor migration speed improvement for old access queries
2016-05-12 13:43:36 -04:00
Akita Noek
6c0c789612
Make job queryset only require JT read access to see
...
As opposed to credential access, since users can see and potentially run
JT's without credential access now.
2016-05-12 13:43:36 -04:00
Akita Noek
fb97438573
Enforce jt admin_role requirement for changing/deleting JobTemplates
2016-05-12 13:43:36 -04:00
Akita Noek
be8a1f4859
Another orgfunc migration fix
2016-05-12 13:43:36 -04:00
Matthew Jones
1faf3cceb8
Fix up notification related unicode errors
...
I'm not sure why I used smart_text instead of smart_str here originally
2016-05-12 10:54:00 -04:00
