11537 Commits

Author SHA1 Message Date
AlanCoding
91031cbbc8 modularize logging config in proper Django fashion 2017-02-10 11:38:32 -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
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
Michael Abashian
bed9974c29 Merge pull request #5260 from mabashian/5221-assign-role-link
Override the ngHref's for jt/wfjt lists inside of the rbac multiselect
2017-02-09 09:12:03 -05:00
Michael Abashian
960e49a24b Merge pull request #5259 from mabashian/4677-workflow-link
Added Template link to workflow job
2017-02-09 09:11:42 -05:00
Michael Abashian
9a317e7f9e Merge pull request #5258 from mabashian/4543-sort-users-orgs
Fixed sorting on a few related lists
2017-02-09 09:11:17 -05:00
Michael Abashian
63a732ae68 Merge pull request #5256 from mabashian/5222-scm-update
Fixed project link in scm_update
2017-02-09 09:10:54 -05:00
jaredevantabor
413e4cc67d keep user on jobs page when relaunching jobs on the jobs page 2017-02-08 21:32:24 -08:00
jaredevantabor
1edf2dc77f adding additional check to prevent race condition 2017-02-08 20:12:04 -08:00
jaredevantabor
18cd38580b fixing the html generation of toggles on related tabs
for notifications
2017-02-08 17:08:55 -08:00
jaredevantabor
57883e37bf Adding default params for some lookup modals
the organization and inventory-script lookup modals require some additional
default params set to properly present the user w/ options they have permission to see.
If these default params aren't set, they'll show up as search tags, which we don't want.
2017-02-08 16:36:53 -08:00
Michael Abashian
fa9d47f548 Override the ngHref's for jt/wfjt lists inside of the rbac multiselect 2017-02-08 19:13:10 -05:00
Michael Abashian
7ae63acf17 Added Template link to workflow job 2017-02-08 19:12:13 -05:00
Michael Abashian
d8262e131a Fixed sorting on a few related lists 2017-02-08 18:24:30 -05:00
Michael Abashian
cba4763b88 Fixed project link in scm_update 2017-02-08 17:58:23 -05:00
Michael Abashian
32622add2c Merge pull request #5243 from mabashian/4804-wf-null-inv
Remove prompt for inv/prompt for cred results from the wf editor jt list
2017-02-08 17:12:30 -05:00
Alan Rominger
90cbfb3cf2 Merge pull request #5234 from AlanCoding/im_the_boss_but_pretend_to_be_one_of_the_members
switcharoo of team admin for member role
2017-02-08 16:53:36 -05:00
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