Chris Meyers
ef7f69ba80
update vmware inventory ini link
2017-01-25 13:28:06 -05:00
Michael Abashian
7c4b77284e
Merge pull request #4934 from mabashian/4906-workflow-launch
...
Fix workflow details view
2017-01-25 10:56:23 -05:00
Michael Abashian
a380830861
Building workflow node tree now returns a promise. Code needed to be updated accordingly
2017-01-25 10:46:28 -05:00
Alan Rominger
8b31251b64
Merge pull request #4928 from AlanCoding/wf_todo
...
Remove workflow TODOs
2017-01-25 10:18:49 -05:00
Alan Rominger
8cbb841989
Merge pull request #4930 from AlanCoding/launch_type_migration
...
include added launch_type choice in 3.1 migration
2017-01-25 10:13:13 -05:00
Chris Meyers
dff41bf035
Merge pull request #4919 from chrismeyersfsu/fix-4698
...
more correctly handle notification email list
2017-01-25 09:57:00 -05:00
AlanCoding
bae3fdb635
removal of workflow TODOs that are resolved
2017-01-25 09:52:05 -05:00
AlanCoding
710702dffe
include added launch_type choice in 3.1 migration
2017-01-25 09:49:29 -05:00
Alan Rominger
8650b69c9e
Merge pull request #4929 from AlanCoding/f8_cache
...
flake8
2017-01-25 09:43:33 -05:00
AlanCoding
35c824b25e
remove cache import for flake8 purposes
2017-01-25 09:34:29 -05:00
Matthew Jones
4771b2efc0
Merge branch 'remove_jobevent_parent_usage' into release_3.1.0
...
* remove_jobevent_parent_usage:
Don't iterate over parents, perform a final update at the end
Drop assignment of job event parent in favor of parent_uuid
2017-01-24 21:07:58 -05:00
Alan Rominger
07fe3be4b2
Merge pull request #4674 from AlanCoding/workflow_handholding
...
Add help text templates for remaining workflow endpoints
2017-01-24 17:05:56 -05:00
Matthew Jones
22a3e87720
Don't iterate over parents, perform a final update at the end
2017-01-24 16:21:50 -05:00
Chris Meyers
8198abe3fa
join array of emails using '\n' when displaying
...
* Don't ASSume user email addresses don't contain ,
* Allows email addresses to contain ,
2017-01-24 15:58:59 -05:00
Chris Meyers
2828352d3e
Merge pull request #4863 from chrismeyersfsu/fix-4787
...
hide add permissions when editing super user
2017-01-24 15:52:41 -05:00
Jared Tabor
78e22bd884
Merge pull request #4913 from jaredevantabor/ctit
...
adding Settings to CTiT breadcrumb bar
2017-01-24 12:48:30 -08:00
Matthew Jones
2af98e5f58
Drop assignment of job event parent in favor of parent_uuid
...
* This eliminates the save lookup of the parent job event and
associated memcached call(s)
* Removes some other legacy parent determination mechanisms
* Alternate way to query for the parent/child relationship
2017-01-24 15:40:33 -05:00
Chris Meyers
cf52b82fa6
hide smart search also
2017-01-24 15:33:18 -05:00
Bill Nottingham
7a39b97b68
Merge pull request #4893 from wenottingham/venv
...
Clear Tower venv in virtualenv creation in packaging
2017-01-24 14:27:37 -05:00
Jared Tabor
baef3797f3
Merge pull request #4914 from jaredevantabor/smart-search-key-exit-holder
...
removing the exit icon from the smart search key pane
2017-01-24 10:15:32 -08:00
jaredevantabor
32c11bb675
removing the exit icon from the smart search key pane
2017-01-24 10:04:53 -08:00
jaredevantabor
cdbf0cb44b
adding Settings to CTiT breadcrumb bar
2017-01-24 09:54:25 -08:00
Jared Tabor
143e416f6f
Merge pull request #4897 from jaredevantabor/ctit
...
CTiT: AD_HOC_COMMANDS select2
2017-01-24 09:00:07 -08:00
Chris Meyers
a804c8ad96
Merge pull request #4887 from chrismeyersfsu/fix-4785
...
conditional stdout resize tooltip text
2017-01-24 11:24:38 -05:00
Graham Mainwaring
7d209d2dda
Merge pull request #4894 from ghjm/deb_no_apache
...
Remove unnecessary mucking about with Apache config
2017-01-24 11:23:01 -05:00
Bill Nottingham
7785bdf5e2
Merge pull request #4907 from wenottingham/ssl-python-aaargh
...
Ensure we have a non-SSL INTERNAL_API_URL.
2017-01-24 11:19:25 -05:00
Matthew Jones
986ddae33e
Merge pull request #4882 from matburt/cache_behavior_fixes
...
Fixes for data corruption/exception in cache usage
2017-01-24 11:12:28 -05:00
Ryan Petrello
b917ffbc63
Merge pull request #4901 from ryanpetrello/release_3.1.0
...
allow certain LDAP settings fields to be nullable
2017-01-24 11:01:31 -05:00
Chris Meyers
e06f2661f8
conditional stdout resize tooltip text
...
related to #4785
2017-01-24 10:12:29 -05:00
jlmitch5
f0e61671a6
Merge pull request #4902 from jlmitch5/changeResultsToDetails
...
change results label to details based on feedback from tvo and taufique
2017-01-24 09:51:53 -05:00
John Mitchell
c59a64b24f
change results label to details based on feedback from tvo and taufique
2017-01-24 09:49:14 -05:00
Michael Abashian
1d4f0a7940
Merge pull request #4886 from mabashian/4860-delete-search-tag
...
Fixed bug that prevented deletion of stdout search tags
2017-01-24 09:35:23 -05:00
Ryan Petrello
0bcbaa5c86
allow certain LDAP settings fields to be nullable
...
necessary to completely resolve #4678
2017-01-24 09:31:44 -05:00
jaredevantabor
d1c33e46db
setting AD_HOC_COMMANDS on scope slightly differently to make select2 happy long time
...
fixing jshint
2017-01-23 19:17:13 -08:00
Michael Abashian
7c8896a96e
Merge pull request #4892 from mabashian/fix-unit-tests
...
Fixed unit test failures
2017-01-23 17:13:14 -05:00
Michael Abashian
0af574e213
Actually fixed the unit tests this time
2017-01-23 17:06:48 -05:00
Michael Abashian
4e62fe084e
Fixed unit test failures
2017-01-23 16:43:12 -05:00
jlmitch5
13cc854a15
Merge pull request #4864 from jlmitch5/jobResultsPerformance2
...
more updates to job results performance
2017-01-23 16:42:35 -05:00
Matthew Jones
b3f4f3bea5
Fix issue reassembling ad-hoc event partials
2017-01-23 16:30:44 -05:00
Matthew Jones
8e2342b7c2
Merge pull request #4881 from matburt/nginx_alt_port
...
Implement alternate ports for nginx
2017-01-23 16:16:51 -05:00
John Mitchell
437f312026
fix jshint error
2017-01-23 16:01:54 -05:00
Ryan Petrello
5253634c72
Merge pull request #4884 from ryanpetrello/release_3.1.0
...
fix an LDAP settings bug which can cause LDAP auth to fail
2017-01-23 15:56:00 -05:00
Chris Meyers
5930fb1a10
Merge pull request #4870 from chrismeyersfsu/fix-4789
...
tooltip location
2017-01-23 15:44:39 -05:00
Michael Abashian
ce5ac04d97
Merge pull request #4867 from mabashian/4856-delete-wf-node
...
Fixed stale workflow node data issue
2017-01-23 15:42:40 -05:00
Michael Abashian
7c970becaa
Fixed bug where you couldn't delete the standard out search tags if there was more than one.
2017-01-23 15:39:41 -05:00
Ryan Petrello
40a5c6cc0b
fix an LDAP settings bug which can cause LDAP auth to fail
...
django-ldap-auth expects the "unset/empty" state of certain LDAP DN
settings (such as AUTH_LDAP_REQUIRE_GROUP and
AUTH_LDAP_USER_DN_TEMPLATE) to be NULL/None (not an empty string).
Resolves #4678
2017-01-23 15:35:23 -05:00
Jared Tabor
5036416491
Merge pull request #4819 from jaredevantabor/autopopulate-lookups
...
Autopopulate lookups
2017-01-23 12:33:14 -08:00
Shane McDonald
1cac3abc9f
Whitespace fix in translation
2017-01-23 14:50:35 -05:00
Matthew Jones
abdd91bd1f
Fixes for data corruption/exception in cache usage
...
Specifically as it relates to serializers and job event writing at
high speeds
2017-01-23 14:39:03 -05:00
Matthew Jones
8a9b2fcaea
Implement alternate ports for nginx
...
* This also allows disabling https mode in the nginx configuration
* Reconfigure the development container to not specifically require
https, so the haproxy cluster configuration can work
2017-01-23 14:34:15 -05:00
