Matthew Jones
4e10d55501
Updating clustering acceptance docs
2016-12-07 11:08:39 -05:00
Alan Rominger
c13a2e9401
Merge pull request #4323 from AlanCoding/team_singleton
...
Prohibit adding singleton permissions as child of team
2016-12-07 10:10:31 -05:00
AlanCoding
3663c97ac2
Prohibit adding singleton permissions as child of team
2016-12-07 08:42:39 -05:00
Chris Church
f2e2ca30ab
Skip settings field validation for encrypted fields if submitted value is the $encrypted$ placeholder.
2016-12-06 19:36:31 -05:00
Chris Church
9feef6e76a
Add default AzureAD settings.
2016-12-06 19:03:05 -05:00
Chris Meyers
73cace35e1
Merge pull request #4313 from chrismeyersfsu/fix-requirements_vmware
...
add vmware deps to ansible venv
2016-12-06 16:49:08 -05:00
Matthew Jones
24b858c6fb
Switch away from deepcopy to improve performance
2016-12-06 13:33:14 -05:00
Matthew Jones
cd11a9c1c2
peg compose tag to active branch
2016-12-06 13:32:33 -05:00
Chris Meyers
49a5c136dd
add vmware deps to ansible venv
2016-12-06 13:29:53 -05:00
Matthew Jones
a894ba4b57
Merge pull request #4310 from ansible/strings_updates
...
Update help text strings
2016-12-06 13:21:14 -05:00
Matthew Jones
71c600cad0
more missing punctuation
2016-12-06 13:18:34 -05:00
Jared Tabor
1be862bd53
Merge pull request #4302 from jaredevantabor/no-license-redirect
...
Redirect to license page if no license
2016-12-06 09:31:59 -08:00
Matthew Jones
6efeeeb083
Adding missing period for timeout
2016-12-06 12:29:56 -05:00
jaredevantabor
8dbaea59b4
Using $log for debugging transitionTo errors
2016-12-06 09:29:33 -08:00
John Mitchell
d62bad536b
add mkdir command to start_development script to cause collectstatic not to error
2016-12-06 12:22:18 -05:00
Matthew Jones
51461a27da
Adding help text to various job fields
2016-12-06 12:18:17 -05:00
jaredevantabor
a9c1969aa0
adding useful comment to $state.defaultErrorHandler
2016-12-06 09:13:19 -08:00
Matthew Jones
ebb0f06b17
Updating host field help text
2016-12-06 12:12:08 -05:00
Matthew Jones
d7ffdf7020
Updating project help text
2016-12-06 12:08:23 -05:00
Matthew Jones
eebdd13aa1
Updating schedules help text
2016-12-06 11:39:08 -05:00
Graham Mainwaring
d8ee92aefd
Merge pull request #4307 from ghjm/move_ui_deps_to_ansible_repo
...
Move npm dependencies to Ansible github org
2016-12-06 10:18:57 -05:00
Graham Mainwaring
5d5fe88a47
Move npm dependencies to Ansible github org
2016-12-06 10:14:08 -05:00
Michael Abashian
dc510b6e31
Merge pull request #4295 from mabashian/3964-edge-conflict-v2
...
Implement edge conflicts when editing the workflow graph
2016-12-06 09:25:00 -05:00
jaredevantabor
fe29f5e0c9
Redirect to license page if no license
...
This was broken due to the upgrade to UI-Router v.1.0.0-beta.3.
I also tracked down the $stateChangeStart function in app.js that when missing
some time in 3.1 development
2016-12-05 19:55:19 -08:00
Alan Rominger
95f54b59cf
Merge pull request #4288 from AlanCoding/user_aud_31_fixes
...
Fix system auditor getter logic
2016-12-05 17:07:19 -05:00
AlanCoding
1daeff8db1
unsaved user system auditor status made more conservative
2016-12-05 17:01:50 -05:00
Alan Rominger
9396fb0400
Merge pull request #4289 from AlanCoding/org_sublist_fix
...
Avoid applying system auditor prop if action was association
2016-12-05 16:58:28 -05:00
Alan Rominger
6d43771190
Merge pull request #4296 from AlanCoding/org_admin_cred_movement
...
Let the org admins share credentials
2016-12-05 16:56:31 -05:00
Alan Rominger
4f8bc13fdb
Merge pull request #4297 from AlanCoding/cred_org_fd
...
Allow reading of credential org field in list view
2016-12-05 16:56:04 -05:00
AlanCoding
81cb57be4f
remove tests pertaining to credential org related field
2016-12-05 16:17:58 -05:00
Ryan Fitzpatrick
69e7ef7110
Include pyrax in ansible requirements ( #4283 )
...
* Include pyrax in ansible requirements
* generate requirements_ansible.txt
* Add secretstorage backend in requirements_ansible.in
2016-12-05 16:14:46 -05:00
AlanCoding
e81dca3249
allow reading of credential org field in list view
2016-12-05 16:00:54 -05:00
AlanCoding
4b5e131362
allow org admins to share credentials between orgs
2016-12-05 15:17:34 -05:00
Michael Abashian
0706ae5981
Recognize edge conflicts when they arise and force the user to fix them before saving.
2016-12-05 15:08:02 -05:00
Chris Meyers
0d8f14647f
Merge pull request #4291 from chrismeyersfsu/fix-unified_job_node
...
finished fixing job through workflow node
2016-12-05 14:27:42 -05:00
Chris Meyers
a5b1c7b579
use more precise exception
2016-12-05 13:54:33 -05:00
Michael Abashian
0346d5a559
Merge pull request #4285 from mabashian/3958-templates-activity-stream-v2
...
Added templates activity stream
2016-12-05 13:44:30 -05:00
Alan Rominger
b6c8fc1513
Merge pull request #4290 from AlanCoding/wf_type_options
...
Workflow jobs in OPTIONS for unified_jobs
2016-12-05 13:39:34 -05:00
Chris Meyers
f47f8abe42
finished fixing job through workflow node
...
related to #4182
2016-12-05 13:35:34 -05:00
AlanCoding
0255b9483d
add workflow jobs to UJ options
2016-12-05 13:27:17 -05:00
AlanCoding
8c64fa2fe1
handle is_system_auditor case with unsaved users
2016-12-05 12:13:28 -05:00
AlanCoding
057efd3d5a
avoid applying system auditor prop if action was association
2016-12-05 11:40:26 -05:00
AlanCoding
14746eebe3
fix system auditor getter logic
2016-12-05 11:22:11 -05:00
Alan Rominger
8e76da89f2
Merge pull request #4286 from AlanCoding/destroyer_of_nodes
...
Switch job destroy WF check to OneToOne patterns
2016-12-05 11:15:47 -05:00
AlanCoding
101b50c888
switch job destroy WF check to OneToOne patterns
2016-12-05 10:10:04 -05:00
Michael Abashian
8ec2662f2e
Added templates activity stream view which is a combination of JT events and WFJT events
2016-12-05 09:45:27 -05:00
Shane McDonald
f0e7385f54
Remove socketio_service handler from defaults.py. Closes #4278 .
...
A reference to socketio in awx/settings/production.py was removed in f399c90a69a1b846eedfbf94ee255c1cb5d4ef53. I’m guessing it also needs to be removed here.
2016-12-04 21:07:21 -05:00
Matthew Jones
20cb3cf7de
Merge pull request #4224 from jangsutsr/4217_add_schedule_capability_to_wfjt_serializer
...
Add schedule capability to wfjt serializer
2016-12-04 21:06:06 -05:00
Matthew Jones
cb2d90673d
Merge pull request #4223 from jangsutsr/4043_add_help_text_to_wfjt_launch_endpoint
...
Add help text to wfjt launch endpoint
2016-12-04 21:05:47 -05:00
Matthew Jones
408c79a845
Merge pull request #4219 from sundeep-co-in/STAGE
...
add django.pot
2016-12-04 21:04:41 -05:00
