11556 Commits

Author SHA1 Message Date
Michael Abashian
445ef69cde Merge pull request #5315 from mabashian/5264-jt-edit-scan-job
Fix bug with scan job template not loading Default project correctly
2017-02-13 09:41:37 -05:00
Michael Abashian
02b0b97390 Merge pull request #5310 from mabashian/5278-activity-stream
Update name/description whenever the activities array changes
2017-02-13 09:40:10 -05:00
Jake McDermott
69ab439d82 Merge pull request #5318 from jakemcdermott/5155_invalidate_token_on_logout
invalidate token on logout
2017-02-13 09:24:30 -05:00
Jake McDermott
f02b5415af add auth token to logout request header 2017-02-12 21:07:13 -05:00
Jared Tabor
d661651068 Merge pull request #5314 from jaredevantabor/copy-move-group
Copy/Move Hosts
2017-02-12 18:03:55 -08:00
Michael Abashian
392242b1a5 Merge pull request #5309 from mabashian/5042-schedule-type-sort
Restore the ability to specify a search field for column sorting
2017-02-10 20:25:20 -05:00
Michael Abashian
b2fa3d80ae Merge pull request #5306 from mabashian/4796-workflow-resize
Workflow editor/details graph responsiveness
2017-02-10 20:24:54 -05:00
Michael Abashian
c59d82bd05 Update name/description whenever the activities array changes 2017-02-10 20:19:37 -05:00
Michael Abashian
1df4adc957 Check job_type as well as !project 2017-02-10 20:16:34 -05:00
Michael Abashian
40c50300f7 Fix bug with job_type = scan not loading Default project correctly 2017-02-10 20:09:39 -05:00
jaredevantabor
7c16dac189 changing URL to 'groups' instead of 'hosts' for CopyMoveHosts 2017-02-10 17:07:56 -08:00
Jared Tabor
d0db4d073a Merge pull request #5313 from jaredevantabor/process-errors
adding null object fix for ProcessErrors module
2017-02-10 15:50:06 -08:00
jaredevantabor
5f10f4c51c adding null object fix for ProcessErrors module 2017-02-10 15:04:16 -08:00
Michael Abashian
84b426079e Restore the ability to specify a search field for column sorting 2017-02-10 15:48:49 -05:00
kensible
b00fbc5e67 Merge pull request #5303 from kensible/5294-ctint-toggle-buttons
Changed toggle buttons to match rest of app
2017-02-10 14:19:23 -05:00
Jared Tabor
43665373e5 Merge pull request #5292 from jaredevantabor/smart-search
Related searches
2017-02-10 10:50:50 -08:00
Michael Abashian
0a02eaa2cf Removed leftover console.log 2017-02-10 13:31:18 -05:00
Michael Abashian
9c686f680d Workflow editor/details graph responsiveness 2017-02-10 13:29:40 -05:00
Ken Hoes
11d15d076b Changed toggle buttons to match rest of app 2017-02-10 11:08:58 -05:00
Chris Meyers
fe29446298 Merge pull request #5286 from chrismeyersfsu/fix-5253
check job status before marking as failed
2017-02-09 16:40:30 -05:00
jaredevantabor
ae69ca8919 fixing related searches w/ smart search 2017-02-09 13:11:29 -08:00
Ryan Petrello
e5e0bd191a Merge pull request #5289 from ryanpetrello/fix-5276
fix a typo in a log handler test
2017-02-09 16:01:07 -05:00
Alan Rominger
0234d7676d Merge pull request #5285 from AlanCoding/fifo2
Get uWSGI reloading working in dev environment
2017-02-09 15:56:47 -05:00
Alan Rominger
8c1be80215 Merge pull request #5277 from AlanCoding/various_logging_updates
Update logging docs & switch out null logger
2017-02-09 15:56:09 -05:00
Ryan Petrello
3631907284 Merge pull request #5272 from ryanpetrello/open-memcache-port
map docker container ports to allow access easier to memcache
2017-02-09 15:52:06 -05:00
Ryan Petrello
a69815faa0 fix a typo in a log handler test 2017-02-09 15:50:28 -05:00
AlanCoding
1d6a36876b have tasks.py deduce location of uwsgi fifo 2017-02-09 15:27:58 -05:00
Chris Meyers
dfb7b08380 check job status before marking as failed
* When rectifying celery <-> db job status, re-check the job status to
ensure it did not finish between the time that we pulled the list of
celery tasks from celery and the time in which we rectify.
2017-02-09 15:27:08 -05:00
Ryan Petrello
a2a4ea486a Merge pull request #5280 from ryanpetrello/fix-5276
correctly set the Authorization header for non-async log handling
2017-02-09 15:23:40 -05:00
Ryan Petrello
cee0b29fef clarify a logging handler docstring 2017-02-09 15:16:58 -05:00
Ryan Petrello
1b9a2e4a36 correctly set the Authorization header for non-async log handling
see: #5276
2017-02-09 15:14:39 -05:00
Matthew Jones
aeee6db868 Trigger rabbitmq cluster node removal from deprovisioning 2017-02-09 13:36:59 -05:00
John Mitchell
8b39d30a7a fix current update cloud icon click 2017-02-09 12:52:36 -05:00
jlmitch5
4e1576c65d Merge pull request #5273 from jlmitch5/distributeStdoutColors
distribute colors if escape sequence isn't in line
2017-02-09 12:38:28 -05:00
AlanCoding
279546e110 make obvious updates to the logging related docs 2017-02-09 12:37:57 -05:00
Jared Tabor
c82e86cc78 Merge pull request #5263 from jaredevantabor/notification-toggles
Notification toggles
2017-02-09 09:04:32 -08:00
Jared Tabor
3f2fc564a2 Merge pull request #5269 from jaredevantabor/launching-jobs
keep user on jobs page when relaunching jobs on the jobs page
2017-02-09 09:04:20 -08:00
Jared Tabor
47a2ba8a30 Merge pull request #5268 from jaredevantabor/4966-license-info-of-undefined
Cannot find "license_info" of undefined
2017-02-09 09:04:06 -08:00
Jared Tabor
7e18c3e172 Merge pull request #5261 from jaredevantabor/lookup-modal-default-params
Lookup modal & default params
2017-02-09 09:03:27 -08:00
AlanCoding
1c6f037076 stop using Django NullHandler which is being removed in future version 2017-02-09 11:53:51 -05:00
Wayne Witzel III
1851276b10 Merge pull request #5271 from wwitzel3/release_3.1.0
Rewrite type to polymorphic_ctype__model for certain filter requests
2017-02-09 11:42:19 -05:00
kensible
2024ca0ae3 Merge pull request #5241 from kensible/4617-search-action-buttons
Search bar width, action button placement
2017-02-09 11:29:32 -05:00
John Mitchell
2f96939792 add new color escape code 2017-02-09 11:29:22 -05:00
Ken Hoes
3559a88c6b Added permissions modal to 100% width 2017-02-09 11:21:55 -05:00
John Mitchell
d570dc6e37 distribute colors if escape sequence isn't in line 2017-02-09 11:04:48 -05:00
Ryan Petrello
4932310ad1 map docker container ports to allow access easier to memcache
this eases memcached interaction from your host, e.g.,
$ echo "get :1:LICENSE" | nc localhost 11211
2017-02-09 11:00:06 -05:00
Bill Nottingham
d513f58934 Merge pull request #5251 from wenottingham/hmm
Don't explicitly require the postgresql server in the RPM spec file.
2017-02-09 10:52:37 -05:00
Ryan Petrello
8753d4968a Merge pull request #5252 from ryanpetrello/log-handler-tests
refactor utils.handlers.HTTPSHandler's usage of django settings
2017-02-09 10:29:38 -05:00
Wayne Witzel III
0562e4baad Rewrite type to polymorphic_ctype__model for certain filter requests 2017-02-09 09:55:25 -05:00
Shane McDonald
60c163c892 Update pot files
String changed in becdc5128cd0de801c5d1e2f6503fc131d3c8969.
2017-02-09 09:37:21 -05:00