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
Akita Noek
f9cc986d85
Merge pull request #1355 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 10:46:47 -04:00
John Mitchell
064a04cf16
update to perm ui for rbac branch
2016-03-31 10:44:41 -04:00
John Mitchell
70c7c0242b
comment out ansible help service
2016-03-31 10:44:41 -04:00
Alan Rominger
38a857c58e
Merge pull request #1322 from AlanCoding/822_keystone_by_new_field_2
...
Back out openstack_v3 options but retain v3 functionality
2016-03-31 10:44:34 -04:00
Wayne Witzel III
ad2c2af22e
fixed get_queryset methods in access
2016-03-31 10:42:43 -04:00
Ken Hoes
ed0770b707
Updates based on PR feedback.
2016-03-31 10:32:04 -04:00
Wayne Witzel III
fa67bd3f0e
unicode safety
2016-03-31 10:24:09 -04:00
Wayne Witzel III
2ae47a6bab
do not use _in for single item
2016-03-31 10:23:42 -04:00
Wayne Witzel III
634f7be692
use explicit class in super to keep the view inheritable
2016-03-31 10:23:25 -04:00
Wayne Witzel III
3d05493c54
use exists instead of count
2016-03-31 10:22:10 -04:00
Akita Noek
2bb9b8a6fe
Merge pull request #1352 from wwitzel3/rbac
...
RBAC PR Fixes
2016-03-31 10:06:20 -04:00
Wayne Witzel III
d20d67d5f3
Merge pull request #1350 from anoek/rbac
...
Split active flag removal migration
2016-03-31 10:05:59 -04:00
Wayne Witzel III
a1d1ddee2b
cleaner get/create impl
2016-03-31 09:58:23 -04:00
Wayne Witzel III
e84008fe51
use len instead of count to take advantage of cache
2016-03-31 09:58:05 -04:00
Akita Noek
c61c8b2b45
Revert accidental active_flag removal changes in south_migrations
...
Fixes #1349
2016-03-31 09:48:14 -04:00
AlanCoding
531c6afa58
further clarify OpenStack options, consolidate to one PopOver
2016-03-31 09:40:01 -04:00
Akita Noek
728c41f03a
Split active flag removal migration into two migrations
...
Re #1344
https://docs.djangoproject.com/en/1.8/ref/migration-operations/#runpython
2016-03-31 09:39:50 -04:00
Akita Noek
534faf011c
count->exists
2016-03-31 09:39:50 -04:00
Akita Noek
156aeb931f
count -> exists
2016-03-31 09:39:50 -04:00
