Commit Graph

7161 Commits

Author SHA1 Message Date
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
db6117a56d Added role description fields
Completes #1096
2016-03-03 16:19:10 -05:00
Akita Noek
048e65eab3 Add test to help detect incorrect role rebuilding 2016-03-03 13:54:45 -05:00
Chris Meyers
569dd83ff6 mock system tracking feature enabled 2016-03-03 13:53:25 -05:00
Chris Meyers
44618d4956 flake8 fix 2016-03-03 11:45:40 -05:00
Chris Meyers
88bf44bfcb Update requirements_jenkins.txt 2016-03-03 11:10:43 -05:00
Leigh Johnson
3df2a6a14e Merge branch 'AboutTower' into devel 2016-03-03 09:46:48 -05:00
Leigh Johnson
761a5303e3 remove log line #1046 2016-03-03 09:21:49 -05:00
Chris Meyers
60484267e7 Merge pull request #1088 from chrismeyersfsu/mongoectomy_cleanup
postgres fact cleanup
2016-03-03 08:31:43 -05:00
Michael Abashian
54699b17ec Made list headers, buttons and search bars responsive down to mobile views. 2016-03-03 08:26:33 -05:00
Leigh Johnson
9ca560ab8c finish modular-izing about modal, delete scattered dependencies for old modal, resolves #1046 2016-03-02 17:07:24 -05:00
Akita Noek
c15d48a640 Locked down user/team role listing and role membership management api endpoints 2016-03-02 16:36:16 -05:00
Michael Abashian
35f1253bf4 Merge pull request #1089 from mabashian/activity-stream-hosts-subtitle
Activity Stream bug fixes
2016-03-02 15:07:57 -05:00
Michael Abashian
f27dde27d6 Merge pull request #1084 from mabashian/stdout-log-directive
Moved standard out log to directive
2016-03-02 15:07:11 -05:00
Michael Abashian
106768606e Fixed bug - need to close out "else if" statement with parenthesis 2016-03-02 15:04:46 -05:00
Jared Tabor
d6bd2abbd0 Merge pull request #1081 from jaredevantabor/job-detail-details
Job Details--details panel and events summary
2016-03-02 11:58:39 -08:00
Jared Tabor
295c6b7db5 Fixes from PR review: panel title alignment, cleanup stale code, add color alias for toggle button 2016-03-02 11:54:06 -08:00
Leigh
09da3c6f82 Merge pull request #1036 from leigh-johnson/LicenseMod
new License module, nuke old License module, resolves #1006, #1007, #1055, #1057
2016-03-02 13:44:05 -05:00
Leigh Johnson
206994944f nix a comment, resolves #1006 #1007 2016-03-02 13:39:07 -05:00
Chris Meyers
b0d228579a add test case to verify delete logic 2016-03-02 12:57:52 -05:00
Matthew Jones
714d13eefd Update docker development workflow to not require make develop 2016-03-02 12:09:42 -05:00
Michael Abashian
3c85e9e639 Removed reload: true since it's not needed to force a transition when going to the activity stream. Changed the "Dashboard" dropdown to "All Activity." 2016-03-02 10:16:40 -05:00
Michael Abashian
b967caedaa Strip the extra query params when the user uses the activity stream dropdown nav. 2016-03-02 10:04:23 -05:00
Michael Abashian
f2f51ab132 Added host case to the GetTargetTitle factory 2016-03-02 09:46:18 -05:00
Akita Noek
9699f34976 Made org admin role a parent of org member role so admins pick up everything members are granted 2016-03-02 09:44:55 -05:00
Chris Meyers
9d24236632 pin pyflakes to allow flake8 to succeed
* flake8 monkeypatches pyflakes to add codes to linting results. It
would seem that pyflakes 1.1.0 adds more checks but flake8 doesn't
monkeypatch to expose them. I've submitted a PR to add error code 405 to
be able to express that we ignore it in our setup.cfg
 https://gitlab.com/pycqa/flake8/merge_requests/56
2016-03-02 09:30:52 -05:00
Akita Noek
f025b8412d Merge pull request #1085 from anoek/rbac
Merging devel into rbac
2016-03-02 09:04:25 -05:00
Michael Abashian
268f5165f7 Got rid of the location url regex for sockets and started using the $state.is(). 2016-03-02 09:04:11 -05:00
Wayne Witzel III
a1cc5b06b8 Remove can_access methods and registration 2016-03-01 17:30:32 -05:00
Chris Meyers
4fc7fea2b8 follow up and finish option request test 2016-03-01 17:28:29 -05:00
Chris Meyers
4b56ea3d07 postgres fact cleanup 2016-03-01 16:57:22 -05:00
Chris Meyers
88865a2203 flake8 fix 2016-03-01 16:57:00 -05:00
Akita Noek
444aed1ab2 Switch make init to use manage.py directly instead of awx-manage, saves from having to install in order to do an init 2016-03-01 15:37:00 -05:00
Akita Noek
3db13bc33c Updated fact tests to use the divergent group fixture
A group fixture was created in different ways, one on devel and one on
rbac, this patch just normalizes to the one usage
2016-03-01 15:34:26 -05:00
Akita Noek
2c690c82d9 Renamed rbac migrations to be after the notification and fact migrations 2016-03-01 15:34:06 -05:00
Akita Noek
c6c176cb5c Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:10:07 -05:00
Akita Noek
ea2cabe4d4 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:09:58 -05:00
Wayne Witzel III
7033542910 Updated Invetory access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
1d179574af Updated Organization and Credential access 2016-03-01 15:01:33 -05:00
Wayne Witzel III
380ccec687 started access refactoring, added UserAccess and updated how ALL permissions is checked 2016-03-01 15:01:33 -05:00
Wayne Witzel III
a4b3567619 Added migration to remove users/admins FK from Org/Teams 2016-03-01 15:00:53 -05:00
Michael Abashian
fb0b760216 Moved standard out log to directive 2016-03-01 13:49:25 -05:00
Matthew Jones
1f19c13ac9 Fix up a Notification unit test issue after the merge 2016-03-01 12:16:10 -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
Chris Meyers
67d1aa6c86 migration with correct help_text 2016-03-01 10:39:51 -05:00
Graham Mainwaring
2f00260f47 Merge pull request #1076 from ghjm/ami_centos
Update base AMI to use CentOS rather than Ubuntu
2016-03-01 10:12:06 -05:00
Chris Meyers
b5d8aa52c9 get accepts data param, use it 2016-03-01 10:08:08 -05:00
Akita Noek
f5e311f5ac Undo some more automatic work that we're suppsoed to test with our migrations 2016-03-01 09:56:43 -05:00
Akita Noek
41c06dc2d0 Update user migration to not bomb out when a UserResource already exists for a user 2016-03-01 09:54:35 -05:00
Chris Meyers
5340af2335 updated api tests to use new get fixture format 2016-03-01 09:48:58 -05:00