6079 Commits

Author SHA1 Message Date
Wayne Witzel III
fa1137d371 Use TransactionTestCase with Django 1.8+ 2016-02-19 15:05:07 -05:00
Wayne Witzel III
fb5369404d (HACK) bump values while we investigate slowness 2016-02-18 15:33:27 -05:00
Wayne Witzel III
65c20e9de2 use objects instead of _default_manager 2016-02-18 13:36:36 -05:00
Wayne Witzel III
30f88b6e30 Added redis in-memory fixture for functional tests 2016-02-18 09:51:32 -05:00
Wayne Witzel III
d464ea0f56 Merge branch 'devel' into rbac 2016-02-17 14:26:05 -05:00
Wayne Witzel III
74e1554463 Only touch the attribute if it does not exist to avoid recursion in activity streams 2016-02-17 11:59:06 -05:00
Wayne Witzel III
241ee09fff Merge branch 'rbac' of github.com:ansible/ansible-tower into rbac 2016-02-17 11:23:18 -05:00
Chris Church
8b2e699ea7 Merge pull request #972 from AlanCoding/755_related_job_templates
Add job_template related list to inventory endpoint
2016-02-16 23:04:11 -05:00
Wayne Witzel III
5306eaa98c more access tests and a Makefile driveby 2016-02-16 21:04:33 -05:00
Chris Meyers
6434171977 add -y to ansible ppa adding 2016-02-16 13:51:16 -05:00
Wayne Witzel III
40ec6a2da2 Fix rbac cred tests 2016-02-16 10:59:53 -05:00
AlanCoding
33e84d03ef add job_template related list to inventory endpoint 2016-02-16 10:12:35 -05:00
Michael Abashian
67b5dcd817 Merge pull request #929 from jlmitch5/schedulerFormStylingFinal
Scheduler form styling fixes
2016-02-16 10:07:02 -05:00
Wayne Witzel III
a8a0cd380d Merge pull request #970 from wwitzel3/rbac
RBAC: access unit tests and new migration
2016-02-16 10:02:01 -05:00
John Mitchell
b3667ce56a combine sleect2 creation into single class 2016-02-16 14:37:57 +00:00
John Mitchell
ffcb8ec65d update less to improve color default 2016-02-16 14:30:11 +00:00
Wayne Witzel III
017a7ee060 Updating RBAC migrations 2016-02-16 08:53:35 -05:00
Wayne Witzel III
7260c1cc0e Added credential access tests 2016-02-15 16:32:42 -05:00
Leigh
bed6c666ae Merge pull request #928 from leigh-johnson/OrgPaginate
#646 Handle case where page 2 of OrganizationList was being hidden
2016-02-15 15:01:27 -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
Leigh
f7ec61f452 Merge pull request #959 from leigh-johnson/ModalBackdrop
#875 add backdrop: static  to modal.Constructor.DEFAULTS
2016-02-15 12:17:18 -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
Leigh Johnson
9278a50029 remove EDIT from edit org breadcrumb label, trim whitespace, add text-uppercase to .BreadCrumb-item 2016-02-15 11:36:46 -05:00
Michael Abashian
5e3e8862f3 Merge pull request #960 from mabashian/stream-awfeature
Hide Activity Stream button when the feature is turned off
2016-02-15 11:08:37 -05:00
Michael Abashian
f2f9dc4703 Removed jshint comment 2016-02-15 11:04:38 -05:00
Akita Noek
e0371f3745 Switched back to multiple-organizations for Projects 2016-02-15 10:43:50 -05:00
Michael Abashian
e5f6373617 Added ProcessErrors declaration 2016-02-15 10:29:54 -05:00
Michael Abashian
5f7de996bd Added logic to hide activity stream button when the feature is turned off. Also added logic to redirect the user to the dashboard when they try to navigate to the stream when the feature is not on. 2016-02-15 10:21:17 -05:00
Leigh Johnson
6bc99971b6 #875 add backdrop: static to modal.Constructor.DEFAULTS 2016-02-15 09:08:19 -05:00
John Mitchell
8ad62b6669 fixed layout issues with form scheduler 2016-02-12 12:00:26 -05:00
John Mitchell
f8550a478b make saving a schedule send you back to the list route 2016-02-12 11:59:39 -05:00
John Mitchell
37c97c968d fix number spinner input issues with scheduler 2016-02-12 11:58:50 -05:00
John Mitchell
e7cf1ce021 add support for select2 in scheduler form 2016-02-12 11:57:40 -05:00
John Mitchell
6283f8715d fixed icon colors for form elements with buttons 2016-02-12 11:56:12 -05:00
John Mitchell
2c432ee974 fix scheduler name border color issues 2016-02-12 11:55:26 -05:00
Wayne Witzel III
61679a47ac Update rbac.md 2016-02-12 11:42:00 -05:00
Leigh Johnson
4558b880a0 remove Stream dependencies 2016-02-12 11:26:33 -05:00
Wayne Witzel III
b44944c8e3 Merge pull request #927 from anoek/rbac
Docs: Added RBAC basic concepts section
2016-02-12 11:13:15 -05:00
Leigh Johnson
4ade498c6c #646 add pagination support to setup > organizations, pass orgCount as pageSize, handle case where a 2nd page might be visible for an unusually high # of orgs, fix breadcrumb shown in organization.edit state 2016-02-12 11:08:47 -05:00
Akita Noek
409c7baa33 doc: Removing .svg for our example image
Apparently .svg's don't work in github markdown
2016-02-12 11:08:08 -05:00
Akita Noek
0ef004171d doc: Try PNG for github markdown instead of SVG 2016-02-12 11:07:31 -05:00
Akita Noek
a4c435c14e doc: Added an example RBAC picture 2016-02-12 11:02:12 -05:00
Akita Noek
76c2454936 Docs: Added RBAC basic concepts section 2016-02-12 10:44:53 -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
Wayne Witzel III
104851e9a5 Update rbac.md
Remove resource_field
2016-02-12 10:18:12 -05:00