Alan Rominger
50bb6b8fc3
Merge pull request #1951 from AlanCoding/1949_scan_runtime_bugs
...
Fix 500 error caused in job launch runtime vars validation
2016-05-18 15:34:58 -04:00
Alan Rominger
b1725491c5
Merge pull request #1946 from AlanCoding/1788_more_err_grammar
...
Error message consistency audit
2016-05-18 15:21:11 -04:00
AlanCoding
5bc0403d9c
add spaces around euality operator
2016-05-18 15:18:27 -04:00
Michael Abashian
365fc31f5b
Merge pull request #1964 from mabashian/activity-stream
...
Turned the activity stream button into a toggle
2016-05-18 14:46:03 -04:00
Michael Abashian
526a1482b1
Need to check for this attributes existence before trying to use it
2016-05-18 14:33:16 -04:00
AlanCoding
f6b3da0c46
Make error message grammar more consistent
2016-05-18 13:39:06 -04:00
Graham Mainwaring
84aa762135
Merge pull request #1948 from ghjm/remove-source-fix
...
Properly remove Tower source from RPM builds
2016-05-18 13:39:02 -04:00
kensible
d7eeedec91
Merge pull request #1927 from kensible/1845-1907-userPassAndDirectUrl
...
Password fields one line, direct URL access for User edit
2016-05-18 12:38:42 -04:00
Michael Abashian
ecf8d8765d
Turned the activity stream button into a toggle. Removed the dashboard icon that was shown when a state does not have an activity stream.
2016-05-18 11:24:07 -04:00
Chris Meyers
e32d20b5c4
Merge pull request #1957 from chrismeyersfsu/fix-restore
...
lay down backup relative to playbook
2016-05-18 10:28:42 -04:00
Matthew Jones
e5ec5c9726
Change prefix for imported sattelite groups
2016-05-18 10:22:12 -04:00
Wayne Witzel III
4395f3945c
Merge pull request #1945 from wwitzel3/issue-1936
...
move related roles UnifiedJobTemplate -> JobTemplate
2016-05-18 10:22:08 -04:00
Alan Rominger
5fc5f1858a
Merge pull request #1801 from AlanCoding/1773_cred_detail_serializer
...
Purge credential detail view of special fields
2016-05-18 09:54:43 -04:00
AlanCoding
f19088db1b
fix job_type change 500 error, patch up runtime tests
2016-05-18 09:24:33 -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
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
Akita Noek
9026d02be2
Fixed our beloved cow
2016-05-17 11:06:58 -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
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
