Leigh
67f42eba8e
Merge pull request #1370 from leigh-johnson/PortalMode
...
Restyle Portal Mode, refactor PortalJobs Widget into view/controller pattern
2016-04-04 13:49:59 -04:00
Matthew Jones
5460bac498
Add historical notifications to notifier summary
2016-04-04 13:38:34 -04:00
Akita Noek
82c55a4ea4
Merge pull request #1384 from wwitzel3/devel
...
RBAC Fixes
2016-04-04 12:38:31 -05:00
Leigh Johnson
eea5b1006b
nudge myjobs/alljobs pills #940
2016-04-04 12:48:04 -04:00
Leigh Johnson
f70bd6d118
add breadcrumb, fix up main-menu ng-class statements to use $state.current instead of $location strings, #939 #940
2016-04-04 12:43:47 -04:00
Wayne Witzel III
554d8ed8a6
add customer API doc fixes:#1390
2016-04-04 12:06:13 -04:00
Wayne Witzel III
75a69d7c83
Merge branch 'devel' of github.com:ansible/ansible-tower into devel
2016-04-04 12:05:34 -04:00
Matthew Jones
469bff1d0b
Fix required fields in notifier serializer
...
Handle the situation where the password field was left as-is when
posting the existing encrypted field
2016-04-04 12:04:31 -04:00
Matthew Jones
b01fe663af
Fix up tests for vacated settings
2016-04-04 11:57:40 -04:00
Chris Meyers
bf09d38c5b
Merge pull request #1392 from chrismeyersfsu/fix-rbacish_unit_tests
...
rbac active removal test cases fixes
2016-04-04 11:18:43 -04:00
Leigh Johnson
3d4e201e00
fix a typo ##939 #940
2016-04-04 11:11:48 -04:00
Leigh Johnson
235cc6bbd5
remove PortalJobs widget and replace with a view/controller pattern resolves #939 & #940
2016-04-04 11:11:48 -04:00
Leigh Johnson
7ed44ec167
restyle & modularize Portal Mode, resolves #940 & #939
...
freeze codebase before separating PortalJobs & PortalJobTemplates into separate views
2016-04-04 11:11:47 -04:00
Matthew Jones
b6706662a4
Disable database settings until after 3.0
2016-04-04 09:59:24 -04:00
Chris Meyers
cdcf81cffa
rbac active removal test cases fixes
2016-04-04 09:56:36 -04:00
Akita Noek
28acc9516d
Hopefully fix ContentType problem hit during 2.4 -> 3.0 upgrade migration
...
#1380
2016-04-01 15:20:18 -04:00
Chris Meyers
4882bef180
fix job templates endpoint rbacism update
2016-04-01 15:13:46 -04:00
Chris Meyers
ff5935ccfd
Merge branch 'test-labels' into devel
2016-04-01 13:36:41 -04:00
Chris Meyers
a01b2913bb
mockity mock mock
2016-04-01 13:34:06 -04:00
Leigh
0a43242b0e
Merge pull request #1378 from leigh-johnson/devel
...
Remove mongo + dockerui from docker-compose build
2016-04-01 12:17:16 -04:00
Leigh Johnson
25f6200dd5
remove old docker build instructions
2016-04-01 10:50:51 -04:00
Leigh Johnson
097fba690b
update docker-compose build, resolves #1377
2016-04-01 10:35:07 -04:00
Wayne Witzel III
bf5db9cf83
Merge pull request #1373 from wwitzel3/devel
...
Final merge of RBAC in to devel
2016-04-01 09:31:06 -04:00
Wayne Witzel III
2d8d2e5422
Merge branch 'rbac' into devel
2016-04-01 09:28:54 -04:00
Wayne Witzel III
8ff9f93eb7
Merge branch 'devel' of github.com:ansible/ansible-tower into devel
2016-04-01 09:26:24 -04:00
Akita Noek
a4ee862b6a
Merge pull request #1372 from wwitzel3/rbac
...
RBAC migration fixes
2016-04-01 09:25:39 -04:00
Wayne Witzel III
d7a81c62d3
fixup inventory migration from PR feedback
2016-04-01 09:21:45 -04:00
Wayne Witzel III
1d2d043c29
fixes:#1371 - migration log write permissions
2016-04-01 09:06:40 -04:00
Wayne Witzel III
498e5b5fb1
Merge pull request #1309 from ansible/rbac
...
Quick swap out of our old permission system to a proper RBAC system
2016-03-31 15:57:14 -04:00
Jared Tabor
bb345f48fd
Merge pull request #1366 from jaredevantabor/host-codemirror-fix
...
Fixing scope passed to CodeMirror factory on hosts route
2016-03-31 12:30:20 -07:00
Jared Tabor
c51501223c
Fixing scope passed to CodeMirror factory on hosts route
2016-03-31 12:11:59 -07:00
Akita Noek
935e3921ca
Merge pull request #1365 from anoek/rbac
...
Reverted attempted fix of ActivityStreamAccess
2016-03-31 14:29:17 -04:00
Akita Noek
b9a6f00da2
Reverted attempted fix of ActivityStreamAccess
...
Related to #1364
2016-03-31 14:28:19 -04:00
Wayne Witzel III
2b4edf1a56
Merge pull request #1363 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 14:20:55 -04:00
Wayne Witzel III
ed17be242d
more unicode fixes
2016-03-31 14:20:16 -04:00
Wayne Witzel III
d7a4e0ca99
Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac
2016-03-31 12:41:47 -04:00
Wayne Witzel III
d68fc7a185
create actual QuerySets
2016-03-31 12:41:34 -04:00
Akita Noek
ca6a71d76a
Merge pull request #1361 from anoek/rbac
...
Merge devel
2016-03-31 11:34:05 -04:00
Akita Noek
0ca3c62273
Merge pull request #1360 from anoek/rbac
...
Fixed up unified jobs/job templates api endpoints
2016-03-31 11:32:17 -04:00
Akita Noek
219c09728d
Merge branch 'devel' of github.com:ansible/ansible-tower into rbac
2016-03-31 11:32:02 -04:00
Akita Noek
2de83e63c3
Fixed up unified jobs/job templates api endpoints
2016-03-31 11:24:37 -04:00
Wayne Witzel III
344588b102
Merge pull request #1353 from anoek/rbac
...
Made reverse_gfk implementation suck a whole lot less
2016-03-31 11:22:44 -04:00
Wayne Witzel III
55b06e4d8b
Merge pull request #1358 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 11:21:04 -04:00
Wayne Witzel III
24e20abb1b
more unicode safety
2016-03-31 11:20:19 -04:00
kensible
359da2d958
Merge pull request #1303 from kensible/1044-inventory-manageModal
...
1044 inventory manage modalectomy
2016-03-31 11:16:07 -04:00
Wayne Witzel III
5de3d57980
return actual QuerySet objects
2016-03-31 11:14:08 -04:00
Akita Noek
0101d53876
super(type(obj),self) -> super(Class, self) fixes
2016-03-31 10:54:01 -04:00
Akita Noek
ab03441133
Let exceptions better bubble up through reverse_gfk
2016-03-31 10:54:01 -04:00
Akita Noek
0479c17256
Made reverse_gfk implementation suck a whole lot less
...
#1342
2016-03-31 10:54:01 -04:00
Akita Noek
0360093622
Merge pull request #1356 from jlmitch5/rbac_perm_ui
...
Rbac perm ui
2016-03-31 10:51:14 -04:00
