12954 Commits

Author SHA1 Message Date
John Mitchell
f446705767 update escaped parse standard out unit test 2017-01-11 18:52:06 -05:00
John Mitchell
dc47bacc61 deal with capped lines 2017-01-11 18:51:37 -05:00
Chris Meyers
1cf3a259ee add view more/less logic to credential owners
related to #3313
2017-01-11 18:04:47 -05:00
Jared Tabor
258405aefe Merge pull request #4670 from jaredevantabor/lookup-modal-search-tags
Hiding default search param as a search tag
2017-01-11 15:01:54 -08:00
Chris Meyers
945d5a68f5 Merge pull request #4679 from chrismeyersfsu/fix-4675
wire up teams into the rbac list directive
2017-01-11 17:27:18 -05:00
jaredevantabor
82f16f0551 small change based on PR feedback 2017-01-11 14:25:08 -08:00
Chris Meyers
a9f78af3d2 wire up teams into the rbac list directive
related to #4675
2017-01-11 16:52:31 -05:00
Chris Meyers
3b766cb3e3 Merge pull request #4628 from chrismeyersfsu/fix-4437
word wrap large callback key in alert modal
2017-01-11 16:05:32 -05:00
Michael Abashian
4c6ec808ee Merge pull request #4671 from mabashian/add-permissions-bug-fix
Fixed bug where clicking add permission when editing an org would do nothing
2017-01-11 16:05:06 -05:00
Michael Abashian
46491a59e6 Removed the use of startsWith from encodeParam. PhantomJS didn't recognize that when the unit tests ran in jenkins. Rather than try to figure out why that might be the case I just changed the line. 2017-01-11 15:46:52 -05:00
Bill Nottingham
946a5bde9a Merge pull request #4635 from wenottingham/time-after-time
Don't hardcode a timezone
2017-01-11 15:20:44 -05:00
Michael Abashian
50fd3d38cb Treat any search string that doesn't start with a matching attribute as a string 2017-01-11 15:00:50 -05:00
Alan Rominger
584ef35c76 Merge pull request #4653 from AlanCoding/copy_sp
Refactor of /copy/ GET schema
2017-01-11 14:57:50 -05:00
Michael Abashian
33aabfeb4c Fixed bug where clicking add permission when editing an org would do nothing 2017-01-11 14:53:08 -05:00
AlanCoding
a693aad95d a workable version of the new copy GET schema implemented 2017-01-11 14:43:37 -05:00
jaredevantabor
cd61f58b11 hiding default search param as a search tag
in scenario where the user types a search that conflicts w/ the default search params.
Ex: searching for kind:gce when kind:ssh is a default search param shouldn't create a
search tag for kind:ssh, as someone shouldn't be able to remove that tag...it's a default!
2017-01-11 11:34:27 -08:00
Chris Meyers
86582c89a8 Merge pull request #4658 from chrismeyersfsu/fix-4387
do not display tab tooltip in edit mode by default
2017-01-11 14:19:16 -05:00
Chris Meyers
5ae0b5f73a Merge pull request #4668 from chrismeyersfsu/fix-4663
dem controllers just needed to know who headers is
2017-01-11 14:17:57 -05:00
Chris Meyers
d7f73a4c81 Merge pull request #4662 from chrismeyersfsu/fix-4048
add title parameter to rbac modal directives
2017-01-11 14:13:35 -05:00
Chris Meyers
eaf883f349 dem controllers just needed to know who headers is
related to #4663
2017-01-11 14:02:41 -05:00
Michael Abashian
c452f5fd80 Added more testing 2017-01-11 13:21:19 -05:00
John Mitchell
5ddd918977 updates to job results based on feedback from pr 2017-01-11 13:07:19 -05:00
AlanCoding
2c97425291 prototype for new copy GET details 2017-01-11 12:23:57 -05:00
Matthew Jones
23f4898eea Re-wirte ad-hoc notification templates to organization to match docs 2017-01-11 11:25:08 -05:00
AlanCoding
e69dc0f36e Clarification of copy RBAC messages 2017-01-11 11:20:17 -05:00
Chris Meyers
e1ce3c3199 add title parameter to rbac modal directives
related to #4048
2017-01-11 10:58:40 -05:00
Michael Abashian
644e464798 Handle the injected __search and __icontains so that they don't show up in the search tags. 2017-01-11 10:47:06 -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
9826012499 do not display tab tooltip in edit mode by default
related to #4387
2017-01-11 09:25:00 -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