diff --git a/composer.json b/composer.json index a859c312..2cd2faa7 100644 --- a/composer.json +++ b/composer.json @@ -27,6 +27,6 @@ "monolog/monolog": "1.*", "websoftwares/monolog-zmq-handler": "0.2.*", "swiftmailer/swiftmailer": "^6.0", - "exodus4d/pathfinder_esi": "dev-master#v1.2.1" + "exodus4d/pathfinder_esi": "dev-master#v1.2.2" } } diff --git a/public/img/landing/discord_1.jpg b/public/img/landing/discord_1.jpg new file mode 100644 index 00000000..710b2fce Binary files /dev/null and b/public/img/landing/discord_1.jpg differ diff --git a/public/img/landing/slack_1.jpg b/public/img/landing/slack_1.jpg deleted file mode 100644 index 7bf97f52..00000000 Binary files a/public/img/landing/slack_1.jpg and /dev/null differ diff --git a/public/img/landing/thumbs/discord_1.jpg b/public/img/landing/thumbs/discord_1.jpg new file mode 100644 index 00000000..e351bc3d Binary files /dev/null and b/public/img/landing/thumbs/discord_1.jpg differ diff --git a/public/img/landing/thumbs/slack_1.jpg b/public/img/landing/thumbs/slack_1.jpg deleted file mode 100644 index b81dd31a..00000000 Binary files a/public/img/landing/thumbs/slack_1.jpg and /dev/null differ diff --git a/public/js/v1.3.2/app/ui/dialog/releases.js b/public/js/v1.3.2/app/ui/dialog/releases.js deleted file mode 100644 index 5e4d9159..00000000 --- a/public/js/v1.3.2/app/ui/dialog/releases.js +++ /dev/null @@ -1,84 +0,0 @@ -/** - * releases dialog (GitHub API repository information) - */ - -define([ - 'jquery', - 'app/init', - 'app/util', - 'app/render', - 'bootbox' -], function($, Init, Util, Render, bootbox) { - 'use strict'; - - let config = { - releasesDialogClass: 'pf-releases-dialog' // class for "Releases" dialog - }; - - /** - * load release information in dialog - * @param releasesDialog - */ - let loadDialogData = function(releasesDialog){ - - // lock dialog - let dialogContent = releasesDialog.find('.modal-content'); - dialogContent.showLoadingAnimation(); - - $.ajax({ - type: 'POST', - url: Init.path.gitHubReleases, - // data: updatedMapData, - dataType: 'json' - }).done(function(releasesData){ - requirejs(['text!templates/ui/timeline_element.html', 'mustache'], function(template, Mustache) { - for(let i = 0; i < releasesData.length; i++){ - let releaseData = releasesData[i]; - - // template vars - let data = { - isFirst: (i === 0), - isOdd: (i % 2 !== 0), - releaseDate: releaseData.published_at.substr(0, 10), - releaseData: releaseData - }; - - let content = Mustache.render(template, data); - releasesDialog.find('ul.timeline').append(content); - } - - $('.timeline > li').velocity('transition.expandIn', { - stagger: 300, - duration: 240, - //display: 'auto', - complete: function(){} - }); - }); - }).fail(function( jqXHR, status, error) { - let reason = status + ' ' + jqXHR.status + ': ' + error; - Util.showNotify({title: jqXHR.status + ': login', text: reason, type: 'error'}); - }).always(function() { - dialogContent.hideLoadingAnimation(); - }); - }; - - /** - * show releases dialog - */ - $.fn.releasesDialog = function(){ - let content = ''; - - let releasesDialog = bootbox.dialog({ - className: config.releasesDialogClass, - title: 'Releases', - size: 'large', - message: content - }); - - // after modal is shown ======================================================================= - releasesDialog.on('shown.bs.modal', function(e) { - loadDialogData(releasesDialog); - }); - }; - -}); \ No newline at end of file diff --git a/public/templates/ui/notice.html b/public/templates/ui/notice.html index 67a168ce..06af5f50 100644 --- a/public/templates/ui/notice.html +++ b/public/templates/ui/notice.html @@ -7,10 +7,11 @@
diff --git a/public/templates/view/login.html b/public/templates/view/login.html index a4649ad0..92bd4b14 100644 --- a/public/templates/view/login.html +++ b/public/templates/view/login.html @@ -514,7 +514,7 @@
-

Mass Log   new

+

Mass Log   new