Chris Meyers
be0ee97fb3
Merge pull request #1409 from chrismeyersfsu/labels-cleanup2
...
label cleanup periodic job
2016-04-05 15:27:47 -04:00
Chris Meyers
68c14976db
label cleanup periodic job
2016-04-05 15:25:01 -04:00
jlmitch5
5eeb298536
Merge pull request #1401 from jlmitch5/rbacCredUI
...
Rbac cred ui
2016-04-05 11:26:25 -04:00
John Mitchell
83a656653d
add error handling of admin of org call
2016-04-05 10:33:03 -04:00
Michael Abashian
2d9e34162c
Merge pull request #1391 from mabashian/angular-drag-and-drop-lists
...
Added angular-drag-and-drop-lists dependency
2016-04-05 09:21:21 -04:00
Chris Meyers
2f4e8cd163
Merge pull request #1396 from chrismeyersfsu/labels-rbac
...
Labels rbac
2016-04-05 08:53:49 -04:00
John Mitchell
6153016937
fix to credentials ui based on api change
2016-04-04 17:37:17 -04:00
Chris Meyers
fa6f5329cf
labels + rbac + tests
2016-04-04 17:20:58 -04:00
John Mitchell
f7f92f3725
working commit of cred ui fixes
2016-04-04 15:39:36 -04:00
Akita Noek
e2b01740fb
Merge pull request #1389 from anoek/credential-api
...
Added and updated several credential creation and listing API endpoints
2016-04-04 14:11:21 -05:00
Matthew Jones
b89d183433
Import pytest for skipping settings tests
2016-04-04 14:19:08 -04:00
John Mitchell
3226c2f10e
make org field populate on edit of project
2016-04-04 14:14:41 -04:00
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
Akita Noek
9455225b3d
Merge branch 'devel' of github.com:ansible/ansible-tower into credential-api
2016-04-04 13:12:29 -04: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
Akita Noek
da8cd505cf
Updated and ported select inventory credential tests to new test system
...
Also added all the test cases I wrote for the credential api but forgot
to add before the last checking..
2016-04-04 11:05:34 -04:00
Akita Noek
7bccc6203d
Merge branch 'devel' into credential-api
2016-04-04 10:30:39 -04:00
Chris Meyers
eb2550bc7c
rbac active removal test cases fixes
2016-04-04 10:23:21 -04:00
Chris Meyers
0be8be6954
rbac active removal test cases fixes
2016-04-04 09:59:26 -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
mabashian
88cea14353
Added angular-drag-and-drop-lists dependency
2016-04-04 09:32:20 -04:00
Akita Noek
23aca083eb
Added and updated several credential creation and listing API endpoints
...
Should addres #1379
2016-04-01 16:57:08 -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
