6308 Commits

Author SHA1 Message Date
Akita Noek
e9c3d98a44 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-04 14:02:01 -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
5a31804330 Just use num_pages when we're at the end of a nav list 2016-03-04 13:37:07 -05:00
Chris Meyers
29e0652bfc Merge pull request #1117 from chrismeyersfsu/fix-fact_cache_receiver
find correct fact to update
2016-03-04 11:51:40 -05:00
Chris Meyers
451a633b3f Merge pull request #1115 from chrismeyersfsu/fix-mongo_off
do not require mongo to be on
2016-03-04 11:44:37 -05:00
Chris Meyers
7494b13704 find correct fact to update
* The fact cache receiver needs to look for an exact match, rather than
* a relative, most recent fact.
2016-03-04 11:41:08 -05:00
Akita Noek
e28eec4a56 Fix missing semicolons 2016-03-04 11:37:47 -05:00
Akita Noek
cf5d718fa8 Fixed pagination nav issue
Fixes #1021
2016-03-04 11:36:57 -05:00
Chris Meyers
2d2940fabc Merge pull request #1109 from chrismeyersfsu/fix-system_tracking_unit_tests
mock system tracking feature enabled
2016-03-04 11:15:10 -05:00
Chris Meyers
d56dc25314 do not require mongo to be on 2016-03-04 10:52:12 -05:00
Jared Tabor
75ecafb6ff Merge pull request #1114 from jaredevantabor/job-detail-stdout
Adding Standard Out and other Job Detail things
2016-03-04 07:43:33 -08:00
Jared Tabor
656f77c0de clean up stale code 2016-03-04 07:42:56 -08:00
Chris Meyers
cfeae51254 deny endpoint access to system tracking feature based on license 2016-03-04 10:14:13 -05:00
Chris Meyers
09c5a189ed remove forgotten print 2016-03-04 07:56:29 -05:00
Jared Tabor
fdaee0242a Adding Standard Out and other Job Detail things
This includes the work from the Job Detail standard out panel along with fixes from feedback from UX and other UI devs.
This includes:
- result panel CSS fixes
- selected row styling
- stop job button functionality
- websockets for job detail
- everthing for adding stdout to the job detail: panel, styling, toggle, and websockets
2016-03-03 22:31:40 -08:00
Michael Abashian
de83011954 Merge pull request #1103 from mabashian/activity-stream-responsive
Activity Stream/General List header responsive styling
2016-03-03 16:24:07 -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
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
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