11706 Commits

Author SHA1 Message Date
Bill Nottingham
d50014059d Merge pull request #5409 from wenottingham/lets-go-to-the-source
Ensure bundled source matches the version in requirements.txt
2017-02-17 11:28:31 -05:00
jlmitch5
71c6fc2fa1 Merge pull request #5424 from jlmitch5/jobResultsFixes
Job results fixes
2017-02-17 10:51:52 -05:00
John Mitchell
30b4f17872 fix jshint error 2017-02-17 10:38:38 -05:00
Alan Rominger
68fc75070d Merge pull request #5348 from AlanCoding/dual_jt_count
Update organization counts to correspond with UI lists
2017-02-17 10:13:10 -05:00
Alan Rominger
377d6ebcab Merge pull request #5396 from AlanCoding/signal_intelligence
Avoid a particular kind of nonsense activity stream entry
2017-02-17 10:09:59 -05:00
Alan Rominger
b25a040278 Merge pull request #5418 from AlanCoding/orphan_hack
Make triple-sure that system admins can manage orphaned JTs
2017-02-17 10:07:02 -05:00
Ryan Petrello
16715e9c26 Merge pull request #5405 from ryanpetrello/fix-5391
only bind nginx to IPv6 if a valid IPv6 address exists
2017-02-17 09:59:55 -05:00
Michael Abashian
53ffa9d01e Merge pull request #5406 from mabashian/5401-lookup-modal-spacing
Don't include list actions in lookups
2017-02-17 09:56:08 -05:00
Matthew Jones
6f84849f1a Disable retry files on ansible runs 2017-02-17 09:55:52 -05:00
Michael Abashian
59b4700e04 Merge pull request #5417 from mabashian/fix-org-search
Fix org list search
2017-02-17 09:55:11 -05:00
Michael Abashian
d875b5f76d Merge pull request #5416 from mabashian/add-button-wfjt-node-form
Remove actions from the template list in workflow maker
2017-02-17 09:54:54 -05:00
Michael Abashian
69300b83c6 Merge pull request #5410 from mabashian/5404-ask-checkboxes-credential
Wait to update checkboxes until the credential data is on scope
2017-02-17 09:54:27 -05:00
John Mitchell
9747f7597b fix performance for the last time of 3.1.0? 2017-02-16 16:24:18 -05:00
John Mitchell
656dcdcd2f fix job results out of order case 2017-02-16 16:09:07 -05:00
John Mitchell
d730d751d4 fix state logic for relaunching jobs 2017-02-16 15:28:39 -05:00
AlanCoding
6b45aa758c fix special case where orphan JTs can not be edited by system admins in UI 2017-02-16 14:48:20 -05:00
kensible
4e06ff8dd5 Merge pull request #5412 from kensible/ctint-remove-form-panels
Removed extra Panel class from forms in CTinT
2017-02-16 14:42:48 -05:00
Michael Abashian
9c1a5f3dec Pass the correct django-model to smart search for org list 2017-02-16 14:37:27 -05:00
Michael Abashian
c6f52476b0 Remove actions from the template list in workflow maker 2017-02-16 14:20:43 -05:00
Ken Hoes
2c239ec018 Removed extra Panel class from forms in CTinT 2017-02-16 13:57:48 -05:00
Michael Abashian
070a612b21 Wait to update checkboxes until the credential data is on scope 2017-02-16 13:10:00 -05:00
Bill Nottingham
c86a3049f7 Ensure bundled source matches the version in requirements.txt 2017-02-16 12:44:47 -05:00
Bill Nottingham
dac2045d49 Merge pull request #5350 from wenottingham/markup-of-the-day
Mark some stuff for translation.
2017-02-16 12:18:37 -05:00
Michael Abashian
86560c97c3 Don't include list actions in lookups 2017-02-16 12:12:21 -05:00
kensible
e02c62d211 Merge pull request #5399 from kensible/inv-manage-buttons
Updated inv. manage buttons
2017-02-16 12:00:30 -05:00
Jared Tabor
50add8e05f Merge pull request #5394 from jaredevantabor/ctit-codemirror
CTiT CodeMirror Textareas
2017-02-16 10:57:36 -05:00
Ken Hoes
6f929363ef Updated inv. manage buttons 2017-02-16 10:23:44 -05:00
AlanCoding
d67dadd649 avoid activity stream entries of singleton implicit role associations 2017-02-16 10:22:21 -05:00
Michael Abashian
972db629b5 Merge pull request #5392 from mabashian/4766-search-key-examples
Dynamic search key examples
2017-02-16 10:19:29 -05:00
Michael Abashian
3802103fbc Fixed unit tests 2017-02-16 10:12:41 -05:00
Michael Abashian
d6869a25e8 Merge pull request #5390 from mabashian/4634-group-sync-spacing
Fix spacing between group schedule and breadcrumb bar
2017-02-16 09:58:01 -05:00
Michael Abashian
3ac5b95c39 Fixed whitespace 2017-02-16 09:53:38 -05:00
kensible
7af47a0bce Merge pull request #5377 from kensible/5344-docs-link
Added docs link
2017-02-16 09:10:06 -05:00
Ryan Petrello
424174154d Merge pull request #5383 from ryanpetrello/fix-5311
don't allow private key passphrases for unencrypted private ssh keys
2017-02-16 08:44:06 -05:00
Wayne Witzel III
a44fc6847c Merge pull request #5375 from wwitzel3/issue-5341
Ensure WorkflowJobWorkflowNodesList orders correctly, default by PK
2017-02-16 01:25:09 -05:00
jaredevantabor
1062308035 fix for line escaping for codemirror on ctit 2017-02-15 23:51:23 -05:00
Chris Meyers
d0d44e03e1 Merge pull request #5388 from chrismeyersfsu/fix-5275
ensure job deps are created only once
2017-02-15 17:11:27 -05:00
Michael Abashian
deb9f5389f Fix spacing between group schedule and breadcrumb bar 2017-02-15 17:07:55 -05:00
Michael Abashian
1bb0207bc5 Dynamic search key examples 2017-02-15 17:04:40 -05:00
Michael Abashian
3ff4bb0d14 Merge pull request #5381 from mabashian/3852-search-related
Pull related search fields from related_search_fields
2017-02-15 16:47:04 -05:00
Michael Abashian
15ad450c9b Merge pull request #5382 from mabashian/5378-project-type-permissions
Run through optionsRequestDataProcessing whenever the list data changes
2017-02-15 16:33:38 -05:00
Michael Abashian
34f8468844 Merge pull request #5379 from mabashian/3850-dashboard-graph
Roll d3.js back to 3.3.13
2017-02-15 16:31:32 -05:00
Chris Meyers
6e9488a59b ensure job deps are created only once 2017-02-15 15:54:30 -05:00
AlanCoding
d687ff1be0 delete disable_signals fixture that is not being used 2017-02-15 15:34:14 -05:00
Jared Tabor
4097ce6d74 Merge pull request #5374 from jaredevantabor/jobs-page-relaunch
Relaunching on jobs page...
2017-02-15 15:33:21 -05:00
Alan Rominger
0e4f3c8015 Merge pull request #5376 from AlanCoding/logger_full_reload
Add supervisor command to restart select services on reload event
2017-02-15 15:19:27 -05:00
AlanCoding
3023b4dfaa switch to new nested with pattern from PR review 2017-02-15 14:58:04 -05:00
Matthew Jones
785a8d0789 Fix an issue where smtplib can't handle unicode strings
We probably do get this value as unicode originally but when we store
it, due to a recently fixed bug it will come out as *not* unicode.

So things were accidentally working because py2 smtplib uses hmac
which won't accept unicode.

This change adds a flag to encrypt_field that forces it to skip the
utf8 fixup from before for narrow use cases.
2017-02-15 14:07:30 -05:00
AlanCoding
7e3a5fd2c2 move reload functionality to its own file 2017-02-15 13:42:49 -05:00
Ryan Petrello
4cbdeb0d30 don't allow private key passphrases for unencrypted private ssh keys
see: #5311
2017-02-15 12:27:27 -05:00