Wayne Witzel III
|
27470b0648
|
Merge pull request #3160 from wwitzel3/api_3.0.1
do not allow membership changes to User.admin_role
|
2016-07-29 12:37:26 -04:00 |
|
AlanCoding
|
5dbbaf4105
|
add code to HostAccess can_add so the browsable API will work
|
2016-07-29 12:02:40 -04:00 |
|
James Laska
|
4e93475be1
|
Merge branch 'release_3.0.1' into stable
|
2016-07-29 11:31:50 -04:00 |
|
Wayne Witzel III
|
b862a13d92
|
update unit tetsts
|
2016-07-29 11:30:33 -04:00 |
|
Wayne Witzel III
|
9baa9594c7
|
use get_object_or_400 to fetch Role
|
2016-07-29 11:29:49 -04:00 |
|
Wayne Witzel III
|
b127e74ae4
|
refactor to unit tests
|
2016-07-29 11:29:43 -04:00 |
|
Wayne Witzel III
|
52865eea6a
|
restrict User.admin_role membership changes through RoleUsersList
|
2016-07-29 11:29:41 -04:00 |
|
Wayne Witzel III
|
a431ac7854
|
fix test
|
2016-07-29 11:29:39 -04:00 |
|
Wayne Witzel III
|
06bb8871d7
|
do not allow membership changes to User.admin_role
|
2016-07-29 11:29:36 -04:00 |
|
kensible
|
df4a854ff0
|
Merge pull request #3162 from kensible/btn-primary-blue
Returning btn-primary to blue
|
2016-07-29 10:42:23 -04:00 |
|
Ken Hoes
|
3f7ff74e28
|
Returning btn-primary to blue
|
2016-07-29 10:20:08 -04:00 |
|
Alan Rominger
|
a078254508
|
Merge pull request #3157 from AlanCoding/3129
Protect NotFound error in POST to TeamRoles
|
2016-07-28 20:20:00 -04:00 |
|
AlanCoding
|
1fb173b2e5
|
RoleTeam and TeamRole sublist NotFound exception handling and test update
|
2016-07-28 16:01:42 -04:00 |
|
Michael Abashian
|
af7b87c73b
|
Merge pull request #3155 from mabashian/3057-adhoc-relaunch-password
Fixed adhoc relaunch logic to match normal adhoc launch logic
|
2016-07-28 14:36:04 -04:00 |
|
kensible
|
d1503c4327
|
Merge pull request #3154 from kensible/3149-adhoc-job-breadcrumbs
Breadcrumb appears correctly on first run
|
2016-07-28 11:58:13 -04:00 |
|
Graham Mainwaring
|
951d8e1555
|
Check that venv is activated before loading wsgi app (#3148)
Check that venv is activated before loading wsgi app
|
2016-07-28 10:31:29 -04:00 |
|
Michael Abashian
|
91fa769202
|
Fixed adhoc relaunch logic to match normal adhoc launch logic
|
2016-07-28 10:26:15 -04:00 |
|
Ken Hoes
|
978fec2a4a
|
Breadcrumb appears correctly on first run
|
2016-07-28 10:16:23 -04:00 |
|
Michael Abashian
|
1d84139030
|
Merge pull request #3143 from mabashian/1790-smart-status-vert-align
Vertically center smart status icons if they are all of one type
|
2016-07-28 09:31:28 -04:00 |
|
Jared Tabor
|
3a66c83e7c
|
Merge pull request #3151 from jaredevantabor/O-auth
Make check for idle session more specific
|
2016-07-27 14:22:42 -07:00 |
|
Alan Rominger
|
2895c9fe9c
|
Merge pull request #3150 from AlanCoding/3146_org_admin_sys_aud
Limit creation of system auditors to superusers
|
2016-07-27 17:16:39 -04:00 |
|
AlanCoding
|
945635eb70
|
also limit creation of system auditors to superusers
squash
|
2016-07-27 17:02:08 -04:00 |
|
Jared Tabor
|
45e506ec0f
|
Make check for idle session more specific
in order to avoid collision with a social auth session's startup.
|
2016-07-27 13:52:26 -07:00 |
|
kensible
|
3b451ccebb
|
Merge pull request #3130 from kensible/2797-long-job-names
Fixed display of non-breaking names
|
2016-07-27 14:24:08 -04:00 |
|
kensible
|
beed576292
|
Merge pull request #3128 from kensible/3122-audit-0725
Continuing audit work
|
2016-07-27 14:23:19 -04:00 |
|
Alan Rominger
|
0c8946702c
|
Merge pull request #3139 from AlanCoding/3096_show_sys_JT
Show system JTs in the UJT list
|
2016-07-27 14:21:24 -04:00 |
|
Michael Abashian
|
3e5244821f
|
Vertically center smart status icons if they are all of one type
|
2016-07-27 13:30:12 -04:00 |
|
AlanCoding
|
1d951a7eff
|
use same model method to determine read permission as we do in the views
|
2016-07-27 12:13:38 -04:00 |
|
AlanCoding
|
32a9c812e3
|
special case filter to show inventory id for group
|
2016-07-27 11:48:22 -04:00 |
|
AlanCoding
|
e27ce600c5
|
add system job templates to the unified JT list
|
2016-07-27 10:28:53 -04:00 |
|
James Laska
|
f53a1b8f6c
|
Use foreman.id instead
foreman.uuid isn't always present
|
2016-07-27 10:18:31 -04:00 |
|
Wayne Witzel III
|
3e0d9e4d03
|
Merge pull request #3126 from wwitzel3/3.0.1
Restrict what roles you can assign to teams.
|
2016-07-27 09:50:26 -04:00 |
|
Michael Abashian
|
846391eebe
|
Merge pull request #3086 from mabashian/3065-group-schedule-tooltip
Added tooltip to group schedule action button
|
2016-07-27 09:18:53 -04:00 |
|
Wayne Witzel III
|
a0c563e831
|
flake8 fixups
|
2016-07-26 14:50:48 -04:00 |
|
Ken Hoes
|
44b2f8f1fb
|
Fixed display of non-breaking names
|
2016-07-26 14:19:46 -04:00 |
|
Ken Hoes
|
d5674672f5
|
Continuing audit work
|
2016-07-26 13:31:46 -04:00 |
|
Michael Abashian
|
a4b4c797de
|
Merge pull request #3090 from mabashian/3084-error-prompt-enter
Fix alert modal -> hit enter -> redirect to home page
|
2016-07-26 13:09:58 -04:00 |
|
Michael Abashian
|
345e596877
|
Merge pull request #3085 from mabashian/3083-inv-perm-search
Updated inventories permissions basepath
|
2016-07-26 13:09:34 -04:00 |
|
Wayne Witzel III
|
df1464d4bf
|
fixing tests for new team role assignment restrictions
|
2016-07-26 12:10:19 -04:00 |
|
Wayne Witzel III
|
74b013aad0
|
driveby cleanup
|
2016-07-26 12:09:58 -04:00 |
|
Wayne Witzel III
|
9bad20cee3
|
do not allow assignment of system roles or user.admin_role to teams
|
2016-07-26 12:09:36 -04:00 |
|
kensible
|
69432e8586
|
Merge pull request #3113 from kensible/1798-select2-open-radius
Removed bottom border radius from open select2 dropdown
|
2016-07-26 08:22:35 -04:00 |
|
Leigh Johnson
|
97b4a800c1
|
remove aws ask at runtime prompt from cred form config, resolves #3055 (#3058)
|
2016-07-25 17:39:19 -04:00 |
|
Leigh Johnson
|
136e1894f5
|
fix missing URI encoding in event summary serch, kickback on #2980 (#3050)
|
2016-07-25 17:39:19 -04:00 |
|
Matthew Jones
|
bfd037e00b
|
Switch base class for StateConflict
This fixes the output format for the 409 exception return
|
2016-07-25 17:39:19 -04:00 |
|
Michael Abashian
|
95f461afb3
|
Fixed password show/hide on enter for survey maker password type previews
|
2016-07-25 17:39:19 -04:00 |
|
Michael Abashian
|
324b1f8902
|
Fixed password show/hide on enter for survey taker survey questions where type is password
|
2016-07-25 17:39:19 -04:00 |
|
Chris Church
|
1caa5d01b8
|
Prevent populate_user from being registered multiple times.
|
2016-07-25 17:39:19 -04:00 |
|
Jared Tabor
|
b3d3a6e590
|
Fixing iterator used when jobs list refreshes
it was still using the iterators used when there were four job panes
|
2016-07-25 17:39:19 -04:00 |
|
Matthew Jones
|
ebdf0e49b5
|
Explicit super user check for JT can_delete
|
2016-07-25 17:39:19 -04:00 |
|