Alan Rominger
e7d9fe0204
Merge pull request #3951 from AlanCoding/label_test_fix
...
Environment specific label test failure fix
2016-11-11 12:52:50 -05:00
Alan Rominger
93f68ad0e2
Merge pull request #3956 from AlanCoding/spec_update
...
Change survey_spec validation to work with newer JSONField
2016-11-11 12:52:38 -05:00
Michael Abashian
b08a8a7997
Quick fix to get adding inventory source nodes working within workflows
2016-11-11 11:43:34 -05:00
Michael Abashian
b9927edccd
Merge pull request #3955 from mabashian/jshint-fixes
...
Fixed lingering jshint errors
2016-11-11 11:37:21 -05:00
AlanCoding
d105414708
change survey_spec validation to work with newer JSONField
2016-11-11 10:59:51 -05:00
Michael Abashian
88fb6ca4af
Fixed lingering jshint errors
2016-11-11 10:40:41 -05:00
Leigh Johnson
53760be4ae
Update job_template param naming. Fixes error thrown on transition from job template add => edit state. @NoIssue
2016-11-11 10:31:45 -05:00
Michael Abashian
99eb7ff02b
Merge pull request #3931 from mabashian/workflows-branched-s3
...
Add/Edit Workflows with smart search integration
2016-11-11 09:51:50 -05:00
AlanCoding
15558aac08
environment specific label test failure fix
2016-11-11 09:40:35 -05:00
Michael Abashian
92840b2752
Fixed broken templates name link. It should now appropriately redirect the user to the edit JT/WFJT page
2016-11-10 18:17:05 -05:00
Michael Abashian
44625b4a76
Turn smart status back on. This will throw a js error for workflow rows until recent_jobs are added as a summary_field to workflows
2016-11-10 18:03:35 -05:00
Michael Abashian
caa773020c
Pulled in the colors css files so that I can use @color-names instead of hex
2016-11-10 17:51:51 -05:00
Michael Abashian
c3a3b2662e
Internationalized workflow related forms
2016-11-10 17:43:41 -05:00
Michael Abashian
ca32c34036
Added a lot of permissions related logic to the workflow form as well as the workflow maker. I know it's not perfect but its a step in the right direction.
2016-11-10 16:44:11 -05:00
Shane McDonald
8c4872836e
Fix pyc errors when running tests
2016-11-10 16:20:12 -05:00
Leigh Johnson
fb991bc74b
Remove defunct .bowerrc
2016-11-10 16:09:43 -05:00
Graham Mainwaring
6f50a450af
Merge pull request #3943 from ghjm/devel
...
Remove obsolete script
2016-11-10 14:54:35 -05:00
Graham Mainwaring
a9e46e2720
Remove obsolete script
2016-11-10 13:38:58 -05:00
Shane McDonald
6f39995060
Fix docker-compose error
...
Fixes this error:
```
ERROR: yaml.parser.ParserError: while parsing a block mapping
in "./tools/docker-compose/unit-tests/docker-compose.yml", line 10, column 7
expected <block end>, but found '<scalar>'
in "./tools/docker-compose/unit-tests/docker-compose.yml", line 11, column 40
```
2016-11-10 13:38:15 -05:00
Shane McDonald
f0dad06032
.dockerignore
2016-11-10 13:12:29 -05:00
Shane McDonald
cc359ecbad
Default TEST_DIRS in docker-compose
2016-11-10 13:12:29 -05:00
jaredevantabor
9f7ac059b7
Small fix for projects list to update on successful websocket messages
2016-11-10 13:10:22 -05:00
Matthew Jones
30984a3a79
Fix up flake8 errors
2016-11-10 13:07:48 -05:00
Alan Rominger
75c364930f
Merge pull request #3932 from AlanCoding/rbac_related_fixes
...
Quick RBAC check_related fixes
2016-11-10 12:20:42 -05:00
Matthew Jones
1a3d452a2d
Fix an auth issue in the browsable api
...
Trying to get the object could raise an unhandleable permission error if
the user wasn't logged in for certain views
2016-11-10 11:46:25 -05:00
Matthew Jones
5186e7d8b4
Remove some unneeded func tests for instances
2016-11-10 11:46:25 -05:00
Jared Tabor
27ddb7392b
Merge pull request #3941 from jaredevantabor/jobs-page-fix
...
Jobs page fix
2016-11-10 11:37:22 -05:00
jaredevantabor
740daba640
Merge branch 'devel' of https://github.com/ansible/ansible-tower into devel
2016-11-10 11:35:00 -05:00
jaredevantabor
b3dbc59df6
Fixing jobs list page: adding launch & cancel buttons
...
and making sure that you can launch jobs from the jobs list, and that sockets
work with the jobs list for live updates
2016-11-10 11:34:06 -05:00
Michael Abashian
59aeec5705
Small fixes based on PR review feedback
2016-11-10 11:22:08 -05:00
Chris Meyers
9aaf694acf
always allow running at least 1 job
...
* Regardless of capacity
* Add unit tests around this logic
2016-11-10 11:07:05 -05:00
Aaron Tan
ece29737ac
Merge pull request #3915 from jangsutsr/3516_implement_workflow_notifications
...
Implement workflow notifications
2016-11-10 11:05:02 -05:00
Matthew Jones
78b8876ed9
Support expiring of capacity if a node is down
...
For a certain amount of time
2016-11-10 09:52:04 -05:00
Chris Meyers
2672846ad2
Merge pull request #3934 from chrismeyersfsu/deps_3.1-bump
...
Deps 3.1 bump
2016-11-10 09:40:07 -05:00
Chris Meyers
697ff11e3b
move python dep git repos to ansible org
2016-11-10 09:27:44 -05:00
Chris Meyers
b9462bfad6
remove, not used, gevent-socketio
2016-11-10 09:10:26 -05:00
Chris Meyers
5d205f1e1b
remove deprecated mongo fact code and deps
...
* We have the requirements that users with Tower < 3.0.x must upgrade to
3.0.x before > 3.0.x. Thus, we are save to delete all mongo migration
code and deps.
2016-11-09 16:25:27 -05:00
Graham Mainwaring
313a8a7d67
Merge pull request #3933 from ghjm/deb_nginx_2
...
Fix uwsgi and daphne bin install
2016-11-09 16:20:30 -05:00
Chris Meyers
766e4af38e
low hanging fruit requirements spring cleaning
...
* django-jsonfield PR accepted upstream
* django-rest-framework-mongoengine legacy system tracking dep
* python-social-auth PR accepted upstream
2016-11-09 16:12:27 -05:00
kensible
d4d3c8117f
Merge pull request #3922 from kensible/3921-pre-pr-issues
...
Pre-pr fix and ui-router update
2016-11-09 15:46:45 -05:00
AlanCoding
2c9cf0f6d6
fixes for RBAC bugs from check_related
2016-11-09 15:38:09 -05:00
Michael Abashian
5a940ff06a
Fixed jshint errors and fixed bug where edge types were not being properly limited based on sibling edge types
2016-11-09 15:15:38 -05:00
Aaron Tan
c1419a799d
Enhance notification text.
2016-11-09 14:15:29 -05:00
Michael Abashian
5ff2267211
Removed console.logs and cleaned up some unit test related errors
2016-11-09 13:40:05 -05:00
Leigh Johnson
0d3eb67bd0
Fixes namespace collision & allows command-line options to be passed to UI build system ( #3876 )
...
* Fixes BrowserSync window.name namespace collision #3872
* Allow command-line arguments to be passed to development UI builds.
Add support for --ng-debug and --router-debug flags to turn on Angular's
$log service and ui-router's trace utility.
Cleans up development debug settings & defunct websocket configuration.
Resolves lingering issues raised by trying read asynchronously-loaded config file during AngularJS config phase. #3872
* shrinkwrap updated minimist
* update CONTRIBUTING.md to include UI build options
* feedback/review
2016-11-09 12:49:18 -05:00
Shane McDonald
fe24d0fe0f
Merge pull request #3920 from shanemcd/bubblewrap-ppa
...
Bubblewrap ppa
2016-11-09 11:52:09 -05:00
Michael Abashian
9e097e9d99
Now running all of the form questions through form gen. Fixed node add/edit communication between nested scopes as a result of smart search integration.
2016-11-09 11:45:21 -05:00
Leigh Johnson
3706cc9337
Switch Grunt jshint to stdout output #3845
2016-11-09 11:41:09 -05:00
jaredevantabor
478fc33710
adding workflow status bar to workflow results
2016-11-09 11:09:33 -05:00
Ken Hoes
a071ca7173
Pre-pr fix and ui-router update
2016-11-09 10:31:05 -05:00
