Commit Graph
30 Commits
Author SHA1 Message Date
Akita Noek 38f22cc839 Merge pull request #1121 from anoek/rbac
Merging devel
2016-03-04 14:03:43 -05:00
Akita Noek e5b0e2aeb3 Merge pull request #1064 from anoek/devel
Fixed pagination nav issue
2016-03-04 14:00:24 -05:00
Akita Noek ddbf4dff80 Merge pull request #1110 from anoek/rbac
Role description fields and some api lock down
2016-03-03 16:20:34 -05:00
Akita Noek f025b8412d Merge pull request #1085 from anoek/rbac
Merging devel into rbac
2016-03-02 09:04:25 -05:00
Akita Noek 7b949b36ff Merge pull request #1083 from anoek/rbac
Automatic RBAC hierarchy adjustment code for save/delete
2016-03-01 11:49:01 -05:00
Akita Noek c5b7d3363b Merge pull request #1062 from anoek/rbac
Added some resource type and name information to the access list for the UI
2016-02-26 10:47:16 -05:00
Akita Noek 5551ec29ec Merge pull request #1037 from anoek/rbac
Merging devel into rbac
2016-02-25 13:06:50 -05:00
Akita Noek ced41c64de Merge pull request #1033 from wwitzel3/rbac
Added UserResource
2016-02-24 14:13:02 -05:00
Akita Noek 47dfc09cb2 Merge pull request #1017 from anoek/rbac
Added 'resource_access_list' related field to resources
2016-02-23 16:12:54 -05:00
Akita Noek dc8ec283d2 Merge pull request #1014 from anoek/rbac
Added several related fields to the RBAC API
2016-02-23 16:08:07 -05:00
Akita Noek aa3a33447e Automatically add users with is_superuser to System Admin role
Also fixed issue with System Admin role name not being set and made some
constants for the singleton names we use
2016-02-22 09:44:00 -05:00
Akita Noek d3c620926a Merge pull request #990 from anoek/devel
Updated API test fixtures
2016-02-18 13:37:04 -05:00
Akita Noek e1c1904218 Merge pull request #964 from anoek/rbac
Merge devel
2016-02-15 13:41:23 -05:00
Akita Noek d5c41d02ea Merge branch 'devel' into merge-devel 2016-02-15 13:38:01 -05:00
Akita Noek 380ba8a41d Merge pull request #962 from anoek/rbac
"Completion" of RBAC migrations; resource_field elimination
2016-02-15 13:36:31 -05:00
Akita Noek aafe521986 doc: ImplicitRoleField after the elimination of resource_field
Completes #926
2016-02-15 12:55:51 -05:00
Akita Noek e2a428b9f5 Removed resource_field ImplicitRoleField
We just now assume that this field is always named 'resource'

 Completes functionality of #926, documentation next
2016-02-15 12:38:17 -05:00
Akita Noek c77620f1ae Added support in ImplicitRoleField to handle following reverse m2m maps 2016-02-15 11:49:54 -05:00
Akita Noek 243b78ee25 Job template migration and migration tests 2016-02-15 11:48:17 -05:00
Akita Noek e0371f3745 Switched back to multiple-organizations for Projects 2016-02-15 10:43:50 -05:00
Akita Noek ec3f184737 Merge pull request #922 from anoek/rbac
RBAC refactoring and first pass at ORMification
2016-02-12 10:19:30 -05:00
Akita Noek 4bc9ca2096 Merge pull request #905 from wwitzel3/rbac
RBAC tests and fixes
2016-02-10 15:22:11 -05:00
Akita Noek 2de6bdd5c3 Merge pull request #886 from anoek/rbac-devel-integration
Pull in latest patches on devel
2016-02-09 09:51:14 -05:00
Akita Noek 6df8017cb1 Merge pull request #877 from wwitzel3/rbac-port-migrations
Convert migrate_to_rbac method to Migrations
2016-02-08 16:30:35 -05:00
Akita Noek 1418e95155 Merge pull request #813 from anoek/rbac 2016-02-05 17:05:30 -05:00
Akita Noek f6357cbfe5 Merge pull request #737 from anoek/645_no_log_ansible
Added missing 'skipped' field for our no_log white list
2016-01-28 12:48:48 -05:00
Akita Noek 6b973896ee Merge pull request #734 from anoek/645_no_log_ansible
Obey no_log even more when using ansible 2.0
2016-01-28 11:49:52 -05:00
Akita Noek 74dc4a59c2 Merge pull request #683 from anoek/test_performance_rrule
5% performance boost on make test
2016-01-26 11:11:38 -05:00
Akita Noek c8d7778ed5 Merge pull request #665 from anoek/documentation
Minor documentation fixes
2016-01-20 15:30:21 -05:00
Akita Noek 9a10a29016 Merge pull request #662 from anoek/645_no_log_ansible
Obey no_log with ansible 2.0
2016-01-20 15:29:43 -05:00