Commit Graph

7641 Commits

Author SHA1 Message Date
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
Matthew Jones 76728fcba7 Set a user agent for the webhook if not provided 2016-05-12 10:54:00 -04:00
Wayne Witzel III 0ef456e4d8 added related Roles to Project, Credential, Inventory, and Group 2016-05-12 10:05:46 -04:00
Ken Hoes 86b7d08b58 PR feedback fixes 2016-05-12 10:04:09 -04:00
Leigh b053780326 fix error adhoc command error, resolves #1800 (#1900) 2016-05-12 09:31:46 -04:00
Leigh 03bdf0b1aa Add aw-tool-tip directive to Form > Add disabled tabs, clean up forms 2016-05-12 09:26:54 -04:00
Chris Meyers 4096583b47 has no one been runnning py.test ? 2016-05-12 09:21:13 -04:00
Jared Tabor 8c03471921 Merge pull request #1897 from jaredevantabor/inv-source-notifications
Disabling notifications for manual inv sources
2016-05-12 09:06:23 -04:00
Jared Tabor 5a3e384716 Disabling notifications for manual inv sources 2016-05-11 17:36:04 -04:00
Shane McDonald 468c63f584 *Really* display correct expiration date on license page.
calcDaysRemaining has recently been updated to return a string (`${duration} Days`) and calcExpiresOn was getting confused.

This change feels a little hacky but it gets the job done. I'm open to other suggestions if anyone has them.
2016-05-11 17:19:02 -04:00
Matthew Jones 8a0b40e478 Force scp usage instead of sftp for ad-hoc jobs 2016-05-11 16:03:57 -04:00
Matthew Jones c6eedce3d8 Further purging of cleanup_deleted 2016-05-11 15:07:56 -04:00
Ken Hoes 9250034f26 Added copy in for host tool tips 2016-05-11 14:25:34 -04:00
Chris Meyers 1e12fa47ae Merge pull request #1894 from ansible/fix-supervisord
let supervisord be the daemon
2016-05-11 13:57:58 -04:00
Wayne Witzel III f12c6530cf fix rbac summary_fields test 2016-05-11 11:41:53 -04:00
kensible 2bb612afbb Merge pull request #1864 from kensible/1339-safariFixes
Fixing flex layout issue w/ Safari
2016-05-11 11:03:36 -04:00
Ken Hoes 094b696fdc Credential UX audit cleanup 2016-05-11 11:01:07 -04:00
John Mitchell 1f31a49cbb fix of text color of menu bar 2016-05-11 10:55:35 -04:00
Shane McDonald dacbeed5a4 Merge pull request #1886 from shanemcd/license-expiration-date
Fix license expiration date / time remaining
2016-05-11 10:25:48 -04:00
Shane McDonald 8aa7c604a4 Display correct time remaining on license page 2016-05-11 09:39:26 -04:00
Wayne Witzel III 6a5f4d6113 remove URL and add roles endpoint for JobTemplate 2016-05-10 16:29:11 -04:00