9483 Commits

Author SHA1 Message Date
Jared Tabor
947571fe26 Fixing live events for inventory-manage page 2016-10-04 14:23:39 -07:00
Jared Tabor
0fb4a1a62a Adding socket object to route definitions
for stdout routes, as well as removing some old code
2016-10-04 14:18:44 -07:00
Jared Tabor
aa4a8f6089 Hooking SocketService.subscribe function to $stateExtender
so that socket rooms can be configured on each route that needs sockets s
2016-10-04 14:18:44 -07:00
Leigh Johnson
5b1d4f3d67 remove websocket proxy from build-docker-machine script, freeze ui deps 2016-10-04 14:18:44 -07:00
Jared Tabor
9691e267df adding promise for successful socket connection
in order to prevent the a race condition: the socket was trying to emit
messages to the API to subscribe to rooms before the socket connection was
finshed connectig.
2016-10-04 14:16:59 -07:00
Jared Tabor
0937866e20 refactoring socket functions 2016-10-04 14:16:59 -07:00
Jared Tabor
813eeb9dd9 fixing socketservice init on login 2016-10-04 14:16:59 -07:00
Jared Tabor
e35b5ef6fb Adhoc stdout working with new websockets 2016-10-04 14:16:59 -07:00
Jared Tabor
a091069d9d Move socket helper to a service and remove old code 2016-10-04 14:16:59 -07:00
Jared Tabor
3d979bb661 draft 1 of socket refactoring 2016-10-04 14:16:59 -07:00
Jared Tabor
e9b54dcd3c switching socket.io-client for ReconnectingWebSocket library 2016-10-04 14:16:09 -07:00
Wayne Witzel III
6d4a2a8f8e converting from socketio to channels websocket 2016-10-04 14:13:16 -07:00
Wayne Witzel III
1a9843d5d1 adding initial channels integration 2016-10-04 14:04:52 -07:00
Matthew Jones
4b57263adf Updates to clustering doc
* Notes about routing/dns
* Mention upgrade testing
2016-10-04 12:22:43 -04:00
Aaron Tan
0b3833ced0 Merge pull request #3647 from jangsutsr/3592_enable_jt_assoc_without_extra_deps
Change JT can_change behavior.
2016-10-04 09:51:32 -04:00
Alan Rominger
c1b87baced Merge pull request #3649 from AlanCoding/WJ_license
extend license fix to workflow jobs
2016-10-04 09:41:21 -04:00
Leigh Johnson
bdfed9c87f Escape $ in docker-clean target
Before: https://gist.github.com/leigh-johnson/98331b280b1679bd4c0e4b02f7c59b00
After: Yay!
2016-10-04 00:47:03 -04:00
AlanCoding
e1ace0ba0a extend license fix to workflow jobs 2016-10-03 20:32:11 -04:00
Aaron Tan
2be5d2f23f Unit test added. 2016-10-03 17:32:43 -04:00
Aaron Tan
764ed8d576 Change JT can_change behavior. 2016-10-03 15:37:33 -04:00
Alan Rominger
f23a87e5a0 Merge pull request #3553 from AlanCoding/wf_rbac_prompt
workflows RBAC and prompting
2016-10-03 15:34:47 -04:00
AlanCoding
0154c41eb2 switch to UJT method of creating new jobs 2016-10-03 15:22:15 -04:00
Matthew Jones
ff4d071be9 Adding/updating documentation for Cluster/HA Tower 2016-10-03 14:50:54 -04:00
Alan Rominger
03d97792ed Merge pull request #3640 from AlanCoding/3597_start_license
Make validate_license common to all start access checks
2016-10-03 14:13:58 -04:00
AlanCoding
d734145c38 start capability to return False for manual projects 2016-10-03 11:41:42 -04:00
AlanCoding
3d38637b2d update migration name 2016-10-03 11:16:08 -04:00
Chris Meyers
9e3528de31 change migration name to align with version semantic 2016-10-03 11:15:33 -04:00
Wayne Witzel III
e4c5b9cb18 Merge pull request #3642 from wwitzel3/channels-up
Merge dev and latest channels branch changes.
2016-10-03 10:47:54 -04:00
Wayne Witzel III
0088c5a410 add asgi_amqp req 2016-10-03 10:43:44 -04:00
Wayne Witzel III
3fab2b63b9 dev non-clustering rabbitmq with lvc enabled 2016-10-03 10:42:52 -04:00
Matthew Jones
959342a5fd Fixing up unit tests from HA/Clustering work
* Also purge old fact migration tests
* Upgrade some services on various container images
2016-10-03 10:40:30 -04:00
Wayne Witzel III
530a5c0c88 merging devel 2016-10-03 10:35:50 -04:00
AlanCoding
020c66f6ce make validate_license common to all can_start methods 2016-10-03 10:09:41 -04:00
Chris Meyers
b4c852cf53 change migration name to align with version semantic 2016-10-03 10:06:50 -04:00
Shane McDonald
15eaac049c Add pycparser to SRC_ONLY_PKGS
Fixes stuff due to https://github.com/pyca/cryptography/issues/3187
2016-10-03 09:37:06 -04:00
Chris Meyers
203df91a5d more robust test mode checking 2016-10-03 09:28:44 -04:00
AlanCoding
b2fb7694dc Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-10-03 08:43:05 -04:00
Chris Meyers
9b451076fc Merge pull request #3639 from chrismeyersfsu/improvement-workflows_root_endpoints
add workflow root endpoints
2016-10-03 08:30:29 -04:00
Chris Meyers
649bf08edf add workflow root endpoints 2016-10-03 08:15:39 -04:00
Bill Nottingham
8677c5cceb Merge pull request #3626 from wenottingham/devel
Update help text to reflect 3.0 remove: default change
2016-09-30 15:52:29 -04:00
Chris Church
70e489d62f Save settings.LICENSE as dict instead of str. 2016-09-30 15:30:34 -04:00
AlanCoding
2faafa8071 Merge branch 'devel' of https://github.com/ansible/ansible-tower into wf_rbac_prompt 2016-09-30 10:06:23 -04:00
AlanCoding
2776a56043 bump migration after another one was merged 2016-09-30 09:03:31 -04:00
Bill Nottingham
cc4025977f Update help text to reflect 3.0 remove: default change 2016-09-29 17:01:11 -04:00
Chris Meyers
16ef45f096 Merge pull request #3624 from chrismeyersfsu/improvement-allow_simultaneous
Improvement allow simultaneous
2016-09-29 16:36:51 -04:00
Chris Meyers
9cafebd8db remove job to jt allow_simultaneous dependency
* Foreshadowing of what's to come with the task manager. When deciding
on what job to run in our task manager, we can't depend on job template
fields. Otherwise, this would cost us a query.
2016-09-29 16:19:19 -04:00
Chris Meyers
1a60dd89bd add back in removed method 2016-09-29 16:01:51 -04:00
Chris Meyers
ec2b0ac90d add back in removed method 2016-09-29 16:01:15 -04:00
Matthew Jones
be18737802 Merge branch 'ha_installer' into devel
* ha_installer:
  Fixing up some minor nits with ha setup playbook
  Update postgres yum/apt repo locations
  Add note about when to use short/long name
  Setup playbook modifications for HA/Ramparts
2016-09-29 12:29:25 -04:00
Matthew Jones
a648beba90 Rev django security version 2016-09-29 12:03:06 -04:00