11487 Commits

Author SHA1 Message Date
Ryan Petrello
56433fd2ca move log handling tests from functional -> unit 2017-02-08 16:34:06 -05:00
Ryan Petrello
669012138e refactor utils.handlers.HTTPSHandler's usage of django settings 2017-02-08 16:34:00 -05:00
Jared Tabor
29869f7093 Merge pull request #5186 from jaredevantabor/smart-search
Smart search, and invalid searches
2017-02-08 12:00:02 -08:00
jaredevantabor
2a8bff824a fixing deletion after PR feedback from mabashian 2017-02-08 11:57:01 -08:00
Ryan Petrello
a076ab015d Merge pull request #5246 from ryanpetrello/log-handler-tests
add tests for our custom log aggregator/handler
2017-02-08 14:31:51 -05:00
Ryan Petrello
00af3ccb1a Merge pull request #5247 from ryanpetrello/fix-5239
remove unnecessary hashes included in "CUSTOM_LOGO" help text
2017-02-08 14:20:29 -05:00
Ryan Petrello
2c447942d5 add tests for our custom log aggregator/handler 2017-02-08 14:19:32 -05:00
Michael Abashian
0567542588 Merge pull request #5123 from mabashian/4546-multiselect
Fixed permissions multi-select issues
2017-02-08 14:16:17 -05:00
Alan Rominger
b21513754d Merge pull request #5245 from AlanCoding/inv_src_cred
check related credential for inventory source
2017-02-08 13:47:24 -05:00
Ryan Petrello
34492d677d remove unnecessary hashes included in "CUSTOM_LOGO" help text
see: #5239
2017-02-08 13:46:55 -05:00
Jared Tabor
2c1145570b Merge pull request #5236 from jaredevantabor/remove-teams-from-orgs
Organizations -> Users & Teams, but minus the teams now
2017-02-08 10:39:06 -08:00
Jared Tabor
5ab26a4138 Merge pull request #5235 from jaredevantabor/workflow-cancel
fixing cancel function for workflow results
2017-02-08 10:37:28 -08:00
AlanCoding
f60f1fdcc4 check related credential for inventory source 2017-02-08 13:16:02 -05:00
Michael Abashian
56303c144c Merge pull request #5214 from mabashian/5135-org-job-templates
Fixed up organizations/job templates list
2017-02-08 11:59:20 -05:00
Michael Abashian
aca471ecc9 Merge pull request #5231 from mabashian/4873-pagination-max-pages
Make pagination max pages shown configurable
2017-02-08 11:36:45 -05:00
Michael Abashian
3cef0aed48 Merge pull request #5219 from mabashian/5162-display-large-wf-job
Recursively fetch workflow nodes when there is more than 1 page of nodes
2017-02-08 11:36:21 -05:00
Michael Abashian
9e61c61285 Merge pull request #5218 from mabashian/4939-between-nodes
Disable workflow editor save when currently adding a node
2017-02-08 11:35:29 -05:00
Michael Abashian
7ae5531df1 Fixed org jt's smart status 2017-02-08 11:32:02 -05:00
Matthew Jones
819d8d1fb3 Show the data that would have been a problem sending payload
for websocket
2017-02-08 11:30:15 -05:00
Matthew Jones
4ed054f568 Implement optional message persistence on callback events 2017-02-08 11:11:14 -05:00
jaredevantabor
a7a968e0fa changing the related tab on an edit of an organization to be for users, instead of users & teams 2017-02-07 17:17:03 -08:00
jaredevantabor
db50779731 fixing cancel function for workflow results 2017-02-07 16:04:05 -08:00
jaredevantabor
ab57396fcf Generalizing error message when user inputs an invalid search 2017-02-07 14:41:52 -08:00
jaredevantabor
f00214495a fix for #5179 for deleting tags for non search params 2017-02-07 14:41:52 -08:00
jaredevantabor
bfe3103542 fix for #5181, about entering invalid search entries. 2017-02-07 14:41:52 -08:00
Chris Meyers
48e75b3e19 Merge pull request #5196 from chrismeyersfsu/fix-3326
no tooltip for user roles, only team roles
2017-02-07 17:36:06 -05:00
Michael Abashian
a13643ea79 Handle deleting root node while adding a child to that root node 2017-02-07 17:22:50 -05:00
Alan Rominger
5d45e01219 Merge pull request #5211 from AlanCoding/orphan_jt
Fix bug with system auditors and detail view of orphaned JT
2017-02-07 17:01:13 -05:00
Chris Meyers
2917dd799b Merge pull request #5201 from chrismeyersfsu/fix-5096
take into account inv org when getting custom inv src list
2017-02-07 16:40:39 -05:00
Chris Church
15092c2159 Skip sending task to process cache changes when migrating to database settings. 2017-02-07 16:40:03 -05:00
Ryan Petrello
09686e209e Merge pull request #5232 from ryanpetrello/fix-5194
only loop over project OPTIONS response if the response is valid
2017-02-07 16:23:38 -05:00
Ryan Petrello
866fe7e265 only loop over project OPTIONS response if the response is valid
see: #5194
2017-02-07 16:15:03 -05:00
Michael Abashian
6ab48c6896 Added the ability to pass in a maximum number of pages shown to pagination directive. This is useful for narrow lists particularly in modals. 2017-02-07 15:57:07 -05:00
Ryan Petrello
5554b46401 Merge pull request #5230 from ryanpetrello/fix-5223
fix a CTinT bug in static file config handling
2017-02-07 15:39:56 -05:00
Ryan Petrello
52ff35ab3f fix a CTinT bug in static config parsing
see: #5223
2017-02-07 14:42:04 -05:00
Alan Rominger
a7e43034d7 Merge pull request #5213 from AlanCoding/dry_run
Surface dry_run option for system jobs through the API
2017-02-07 13:41:58 -05:00
Ryan Petrello
b07305f3b2 Merge pull request #5217 from ryanpetrello/fix-5208
enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
2017-02-07 13:21:05 -05:00
Michael Abashian
643c0e240c Recursively fetch workflow nodes when there is more than 1 page of nodes 2017-02-07 13:21:01 -05:00
Ryan Petrello
f4d55659f0 enforce a sane default OPT_NETWORK_TIMEOUT for LDAP connections
see: #5208
2017-02-07 12:37:05 -05:00
Michael Abashian
388a4345b1 Labels expects the iterator to be template not job_template 2017-02-07 11:20:02 -05:00
Michael Abashian
07dbbd375d Disable workflow editor save when currently adding a node 2017-02-07 11:15:27 -05:00
Michael Abashian
8da10a9183 Fixed up organizations/job templates list 2017-02-07 10:41:18 -05:00
AlanCoding
93034ef1d6 surface dry_run option for system jobs through the API 2017-02-07 10:37:41 -05:00
Ryan Petrello
81805c780f Merge pull request #5207 from ryanpetrello/fix-4356
add the max_page_size value to the OPTIONS response for list views
2017-02-07 10:29:22 -05:00
Chris Meyers
382cb8dd4c Merge pull request #1 from jaredevantabor/custom-inv-script-perm
Groups -> Custom Inv Script selection should incorporate the Org
2017-02-07 09:30:49 -05:00
AlanCoding
e5a8eb95b2 fix bugs with system auditors and orphan JTs 2017-02-07 09:18:23 -05:00
Alan Rominger
5a1b56af42 Merge pull request #5202 from AlanCoding/pretty_sys_jobs
aesthetic editing of system job output
2017-02-07 08:41:50 -05:00
Chris Meyers
e33e03f906 Merge pull request #5193 from chrismeyersfsu/fix-4048
name org permissions tab; users / teams
2017-02-06 20:55:28 -05:00
jaredevantabor
d482ef5575 incorporating organization into the custom inv script option selection for a group 2017-02-06 15:41:56 -08:00
Michael Abashian
80313779b2 Fixed bug where deleting search tags was not removing the equivalent state param for lists in modals. Also did some cleanup on pagination directive. 2017-02-06 16:53:14 -05:00