10800 Commits

Author SHA1 Message Date
AlanCoding
e69dc0f36e Clarification of copy RBAC messages 2017-01-11 11:20:17 -05:00
Matthew Jones
8796af7e28 Make session and csrf cookies secure by default 2017-01-11 10:39:46 -05:00
Alan Rominger
8526004408 Merge pull request #4655 from AlanCoding/null_ujt
Handle case of node with null UJT
2017-01-11 10:30:23 -05:00
Matthew Jones
974fe1d244 Fix an issue with set_stats for unsupported Ansible versions 2017-01-11 10:24:17 -05:00
AlanCoding
147c8c0c14 update workflow DAG tests so nodes not in sideways state 2017-01-11 09:49:52 -05:00
Chris Meyers
833c61c8cb Merge pull request #4648 from chrismeyersfsu/fix-4250
better job list empty message
2017-01-11 09:08:58 -05:00
Chris Meyers
706f9fda11 Merge pull request #4652 from chrismeyersfsu/fix-4372
change projects list field ordering
2017-01-11 09:07:51 -05:00
Chris Meyers
b89a8e52ef Merge pull request #4651 from chrismeyersfsu/fix-3833
remove activity stream link on scheduled jobs list
2017-01-11 09:07:05 -05:00
Chris Meyers
79d374db2b Merge pull request #4650 from chrismeyersfsu/fix-4047
better empty list error message
2017-01-11 09:05:58 -05:00
Chris Meyers
422a868982 Merge branch 'release_3.1.0' into fix-4250 2017-01-11 09:05:26 -05:00
kensible
bb641d846d Merge pull request #4643 from kensible/4589-group-sync-schedule-error
Fixed group SCM update schedule listing
2017-01-11 08:45:41 -05:00
Chris Meyers
ab101e06f8 Merge pull request #4646 from chrismeyersfsu/fix-3404
display workflow template instead of wfjt
2017-01-10 19:01:14 -05:00
AlanCoding
8f259f2bb7 handle case of node with null UJT 2017-01-10 18:50:52 -05:00
Chris Meyers
e5a2671d21 rename wfjt to Workflow Template in OPTIONS 2017-01-10 18:23:52 -05:00
Chris Meyers
b903ad069e Revert "display workflow template instead of wfjt"
This reverts commit 459b03e2e90b2aeaaf071a7438323890f238bf3f.
2017-01-10 18:23:26 -05:00
Alan Rominger
0751f8652c Merge pull request #4627 from AlanCoding/fact_defaults
Defaults for cleanup facts management job
2017-01-10 18:19:08 -05:00
Chris Meyers
fc087fb47b Merge pull request #4645 from chrismeyersfsu/fix-3245
gracefully handle 409 on delete
2017-01-10 18:14:21 -05:00
Chris Meyers
3a118f911d change projects list field ordering
related to #4372
2017-01-10 18:02:44 -05:00
Chris Meyers
5a5fcb1614 remove activity stream link on scheduled jobs list
related to #3833
2017-01-10 17:44:37 -05:00
Chris Meyers
36acc5c6bc better empty list error message
related to #4047
2017-01-10 17:19:24 -05:00
Chris Meyers
a41fd5bdf8 display workflow template instead of wfjt
related to #3404
2017-01-10 17:11:45 -05:00
Bill Nottingham
39555fe04a Merge pull request #4642 from wenottingham/windows-fu
Vendor pywinrm and deps for Ansible.
2017-01-10 17:06:07 -05:00
Bill Nottingham
3e8c712771 Licenses + LGPL code for winrm vendoring. 2017-01-10 17:04:48 -05:00
Chris Meyers
fb1e00e3ae better job list empty message
related to #4250
2017-01-10 16:42:30 -05:00
Chris Meyers
1e5eab63df Merge pull request #4638 from chrismeyersfsu/fix-4184_2
permission tab disable for private credentials
2017-01-10 16:20:09 -05:00
Chris Meyers
d590432590 gracefully handle 409 on delete
related to #3245
2017-01-10 15:54:06 -05:00
Chris Meyers
ff41992194 don't include var if not going to use it 2017-01-10 15:52:08 -05:00
kensible
6a880449fb Merge pull request #4637 from kensible/4595-show-hide-ctint
Enable show/hide on password and secret fields
2017-01-10 15:23:21 -05:00
Ken Hoes
0f8f53b9d0 Fixed resolve in route 2017-01-10 14:35:44 -05:00
Bill Nottingham
f3ade65ac6 Vendor pywinrm and deps for Ansible. 2017-01-10 14:27:55 -05:00
Chris Meyers
6c4df56223 Merge pull request #4630 from chrismeyersfsu/fix-4368_2
handle reload when deleting org card under edit
2017-01-10 13:00:18 -05:00
Chris Meyers
fe896dbda5 permission tab disable for private credentials 2017-01-10 12:58:38 -05:00
Ken Hoes
bc4bc2e8ce Enable show/hide on password and secret fields 2017-01-10 12:15:38 -05:00
kensible
dca57b27e8 Merge pull request #4622 from kensible/3.1-audit-list-round2
Fixing audit bugs
2017-01-10 12:04:01 -05:00
Alan Rominger
6e6fd254dd Merge pull request #4629 from AlanCoding/is_new_in_14
Mark inventory scripts as added in 2.1.0
2017-01-10 11:59:51 -05:00
Alan Rominger
ee2c8343ce Merge pull request #4631 from AlanCoding/wf_words
Workflow doc updates, excluding labels copy
2017-01-10 11:58:30 -05:00
AlanCoding
0a975736d9 further workflow doc copy edit with QE 2017-01-10 11:50:58 -05:00
AlanCoding
e52e6ae192 handle case where the UJT related resource is null 2017-01-10 11:33:51 -05:00
AlanCoding
30fb6fcdd3 update clarification on what WFJT copy does 2017-01-10 11:14:44 -05:00
Ken Hoes
52c861503b Updated fix for form titles 2017-01-10 10:15:00 -05:00
Chris Meyers
7f6551ec20 consider org id in url an int 2017-01-10 10:12:09 -05:00
AlanCoding
78d8d4139a workflow docs revisions after label copy change 2017-01-10 10:09:29 -05:00
Chris Meyers
8caf355857 handle reload when deleting org card under edit 2017-01-10 09:50:54 -05:00
AlanCoding
4990a59fa7 mark inventory scripts as added in 2.1.0 2017-01-10 09:38:52 -05:00
kensible
624bdf6c88 Merge pull request #4616 from kensible/3.1-audit-list-round1
Fixing various audit bugs
2017-01-10 09:27:06 -05:00
Chris Meyers
87d77222a3 Merge pull request #4624 from chrismeyersfsu/fix-4265
handle undefined (empty) ec2 variable textarea
2017-01-10 09:01:35 -05:00
AlanCoding
a3d8cbde25 add in defaults for cleanup facts management job 2017-01-10 08:55:13 -05:00
Michael Abashian
b26122d9e1 Merge pull request #4612 from mabashian/permissions-columns
Fixed the column widths on the permissions modals
2017-01-09 18:35:34 -05:00
Chris Meyers
1e5b3fbe31 handle undefined (empty) ec2 variable textarea
* Adding a check for undefined, null check was not enough.
applyDefaults() is only called in 'add' mode. This method is responsible
for settings the fields value to the passed in 'default'. Since
applyDefaults() isn't called in 'edit' mode, the field has a value of
undefined.
2017-01-09 16:43:02 -05:00
Alan Rominger
17f0555362 Merge pull request #4623 from AlanCoding/unicode_inv_import
Unicode conversion of paths in inventory import
2017-01-09 15:59:57 -05:00