From 78d16542b32014a7b439df85a87d15b49d465c51 Mon Sep 17 00:00:00 2001 From: Paul Cochrane Date: Tue, 30 Jun 2015 23:12:20 +0200 Subject: [PATCH 01/15] Add Perl6 to matrix --- app/utils/keys-map.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/app/utils/keys-map.coffee b/app/utils/keys-map.coffee index 7f6a7236..89c9b703 100644 --- a/app/utils/keys-map.coffee +++ b/app/utils/keys-map.coffee @@ -3,6 +3,7 @@ languageConfigKeys = { php: 'PHP' node_js: 'Node.js' perl: 'Perl' + perl6: 'Perl6' python: 'Python' scala: 'Scala' ruby: 'Ruby' From e934061ce792d16f8f407f11023a24207d54898e Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 15:56:21 +0200 Subject: [PATCH 02/15] remove charmscout, add userlike --- Brocfile.js | 1 - app/index.html | 1 + app/initializers/charm.coffee | 17 --- app/styles/app.scss | 1 - app/styles/app/charm.sass | 104 -------------- vendor/charmscout.js | 246 ---------------------------------- 6 files changed, 1 insertion(+), 369 deletions(-) delete mode 100644 app/initializers/charm.coffee delete mode 100644 app/styles/app/charm.sass delete mode 100644 vendor/charmscout.js diff --git a/Brocfile.js b/Brocfile.js index 89133ebc..1ff72870 100644 --- a/Brocfile.js +++ b/Brocfile.js @@ -37,7 +37,6 @@ app.import('bower_components/JavaScript-MD5/js/md5.js'); app.import('vendor/ansiparse.js'); app.import('vendor/log.js'); app.import('vendor/customerio.js'); -app.import('vendor/charmscout.js'); app.import('bower_components/moment/moment.js'); // Use `app.import` to add additional libraries to the generated // output files. diff --git a/app/index.html b/app/index.html index c6a62dfc..b3525c47 100644 --- a/app/index.html +++ b/app/index.html @@ -23,5 +23,6 @@ {{content-for 'body-footer'}} + diff --git a/app/initializers/charm.coffee b/app/initializers/charm.coffee deleted file mode 100644 index 68088671..00000000 --- a/app/initializers/charm.coffee +++ /dev/null @@ -1,17 +0,0 @@ -`import config from 'travis/config/environment'` - -initialize = (container, app) -> - if config.charmKey - window.__CHARM = - key: config.charmKey - url: window.location.protocol + "//charmscout.herokuapp.com/feedback" - - window.bootstrapCharm() - # $('head').append $('') - -Initializer = - name: 'charm' - initialize: initialize - -`export {initialize}` -`export default Initializer` diff --git a/app/styles/app.scss b/app/styles/app.scss index dffd6596..cad3c9d2 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -8,7 +8,6 @@ @import "app/ansi"; @import "app/auth"; -@import "app/charm"; @import "app/forms"; @import "app/github"; @import "app/main/annotations"; diff --git a/app/styles/app/charm.sass b/app/styles/app/charm.sass deleted file mode 100644 index 2b8a89d2..00000000 --- a/app/styles/app/charm.sass +++ /dev/null @@ -1,104 +0,0 @@ - -.feedback-button - display: none - -.pro - .feedback-button - display: inline-block - -.feedback-button - display: inline-block - position: fixed - right: 1% - left: auto - bottom: 0 - margin: 0 - padding: .5em 1em .5em - border-radius: 4px - // transform: rotate(90deg) translateY(-140%) - transform: translateY(20%) - will-change: transform - transition: transform ease 200ms - background: $white - font-size: 13px - color: #a2afb3 - text-transform: uppercase - box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15) - z-index: 89 - &.hidden - display: none - -.feedback-button:hover - // transform: rotate(90deg) translateY(-130%) - transform: translateY(5%) - -.feedback-popup - position: fixed - top: 50% - left: 50% - width: 30em - transform: translate(-50%, -50%) - padding: 1em 1.3em - background-color: #ffffff - border-radius: 5px - z-index: 85 - box-shadow: 0px 0px 3px 1px rgba(0,0,0,0.15) - h1 - margin: 0 0 .4em - padding-left: .4em - color: #347389 - font-size: 22px - textarea - box-sizing: border-box - display: block - width: 100% - height: 10em - margin-bottom: .8em - padding: .5em .6em - resize: vertical - background-color: #f4f3eb - font-size: 16px - color: #7d7e80 - border: none - font-family: $font-family-sans-serif - .submit - margin-right: 1em - padding: .3em .7em - background-color: #37a766 - color: $white - font-size: 16px - border: none - border-radius: 4px - font-family: $font-family-sans-serif - cursor: pointer - p - padding-left: 0.7em - margin: 0.3em 0 0 - a - color: #7d7e80 - font-size: 16px - text-decoration: none - a:hover - text-decoration: underline - - .closed & - display: none - -.feedback-overlay - display: block - position: fixed - top: 0 - right: 0 - bottom: 0 - left: 0 - width: 100% - height: 100% - background-color: rgba(#D5D5CE, 0.7) - z-index: 84 - .closed & - display: none - - -#CHARM_FORM_TARGET - display: none - diff --git a/vendor/charmscout.js b/vendor/charmscout.js deleted file mode 100644 index 27a4c815..00000000 --- a/vendor/charmscout.js +++ /dev/null @@ -1,246 +0,0 @@ -// Copyright (c) 2010-2012 Slash7 LLC http://charmhq.com/ -// Copyright (c) 2010-2012 Thomas Fuchs http://mir.aculo.us/ -// License: https://github.com/cheerful/charmeur/blob/master/MIT-LICENSE - -window.bootstrapCharm = function(){ - var tab, box, email, shown = false, sending = false, openmsg = null, callbacks = {}, - BOX = - '' + - '', - DEFAULTS = { - text: '', - submit: 'Send feedback', - cancel: 'cancel', - your_email: 'Your email address:', - your_comment: 'Your message:', - feedback_sending: '

Sending...

', - feedback_sent: '

Your feedback was sent!

We will get back to you as soon as possible!

', - feedback_error: 'There was a problem sending your message.
Please contact support directly.

close this message' - }; - - function log(s){ - 'console' in window && 'log' in console && console.log(s); - } - - if(!("__CHARM" in window)) { - log('no CHARM data found'); - return; - } - - if(!(typeof __CHARM == 'object')) { - log('CHARM must be an object'); - return; - } - - function $(id){ return typeof id == 'string' ? document.getElementById(id) : id; } - - function init(){ - tab = document.createElement('a'); - tab.id = "CHARM_TAB"; - tab.className = 'feedback-button'; - tab.innerHTML = 'Feedback & Support'; - tab.href = "https://secure.charmhq.com/feedback/" + __CHARM.key; - tab.onclick = function(){ show(); return false }; - document.body.appendChild(tab); - } - - function template(string){ - for(var prop in __CHARM) - string = string.replace(new RegExp('{'+prop+'}'), __CHARM[prop]); - return string; - } - - function customize(id, property){ - $('CHARM_'+id.toUpperCase())[property||'innerHTML'] = template((id in __CHARM) ? __CHARM[id] : DEFAULTS[id]); - } - - function userdata(name){ - if(name in __CHARM) data(name, __CHARM[name]); - } - - function data(name, value){ - var node = document.createElement('input'); - node.type = 'hidden'; - node.value = value; - node.name = name; - $('CHARM_FORM').appendChild(node); - } - - __CHARM.iFrameLoaded = function(){ - if(!sending) return; sending = false; success(); - }; - - __CHARM.iFrameError = function(){ - if(!sending) return; sending = false; error(); - }; - - function show(options){ - if(shown) return; - hideTab(); - shown = true; - - callbacks = options || {}; - - before(); - - if(!box) { - box = document.createElement('div'); - box.id = "CHARM_BOX"; - //box.className = 'feedback-popup'; - box.innerHTML = BOX; - document.body.appendChild(box); - - if(!('email' in __CHARM) || !(/@/.test(__CHARM.email+''))){ - email = document.createElement('input'); - email.id = 'CHARM_EMAIL'; - email.type = 'text'; - email.name = 'email'; - email.value = ''; - customize('your_email'); - customize('your_comment'); - $('CHARM_YOUR_EMAIL').appendChild(email); - box.className = 'feedback-popup closed' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : ''); - } else { - $('CHARM_YOUR_EMAIL').parentNode.removeChild($('CHARM_YOUR_EMAIL')); - $('CHARM_YOUR_COMMENT').parentNode.removeChild($('CHARM_YOUR_COMMENT')); - userdata('email'); - } - - // customize('text'); - // customize('submit', 'value'); - // customize('cancel'); - - userdata('key'); - userdata('customer'); - userdata('customer_info'); - userdata('first_name'); - userdata('last_name'); - userdata('user_info'); - userdata('customer_id'); - userdata('subject'); - - data('location', location.href); - data('user_agent', navigator.userAgent); - data('local_time', (new Date).toString()); - - $('CHARM_FORM').action = __CHARM['url']; - - setTimeout(function(){ - var scrollTop = document.body.scrollTop; - - box.className = 'open' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : ''); - $('CHARM_FORM').onsubmit = function(){ - var ok = !($('CHARM_COMMENT').value.replace(/^\s+/, '').replace(/\s+$/, '') == ""); - if(ok){ - sending = true; - hide(); - message('feedback_sending', false); - } - return ok; - }; - $('CHARM_CANCEL').onclick = function(){ cancel(); return false }; - - setTimeout(function(){ - if($('CHARM_EMAIL')) - $('CHARM_EMAIL').focus(); - else - $('CHARM_COMMENT').focus(); - document.body.scrollTop = scrollTop; - }, 10); - }, 10); - - return; - } - box.offsetLeft; - box.className = 'open' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : ''); - if($('CHARM_EMAIL')) - $('CHARM_EMAIL').focus(); - else - $('CHARM_COMMENT').focus(); - } - - __CHARM.show = show; - - function cancel(){ - hide(); - showTab(); - after(); - } - - function success(){ - showTab(); - message('feedback_sent'); - if(__CHARM.success) __CHARM.success(); - if(callbacks.success) callbacks.success(); - after(); - $('CHARM_COMMENT').value = ""; - callbacks = {}; - } - - function error(){ - show(); - message('feedback_error', false); - if(__CHARM.error) __CHARM.error(); - if(callbacks.error) callbacks.error(); - after(); - callbacks = {}; - } - - function message(id, autoclose){ - if(openmsg) closeMessage(openmsg); - var msg = document.createElement('div'); - msg.id = "CHARM_MESSAGE"; - msg.innerHTML = template((id in __CHARM) ? __CHARM[id] : DEFAULTS[id]); - document.body.appendChild(msg); - msg.className = 'feedback-popup open'; - msg.onclick = function(){ closeMessage(msg); }; - if(autoclose === undefined || !autoclose === false) - setTimeout(function(){ closeMessage(msg); }, 4000); - openmsg = msg; - } - - function closeMessage(msg){ - msg.className = 'closed'; - setTimeout(function(){ - if(msg && msg.parentNode) msg.parentNode.removeChild(msg); - }, 260); - openmsg = null; - } - - function hide(){ - if(!shown) return; - shown = false; - box.className = 'closed' + ($('CHARM_YOUR_EMAIL') ? ' with-email' : ''); - } - - function hideTab(){ - tab.classList.add('hidden'); - } - - function showTab(){ - tab.classList.remove('hidden'); - } - - function after(){ - if(__CHARM.after) __CHARM.after(); - if(callbacks.after) callbacks.after(); - callbacks = {}; - } - - function before(){ - if(__CHARM.before) __CHARM.before(); - if(callbacks.before) callbacks.before(); - } - - init(); -}; From 7ed4d33053fc9e5ae4cf2af1c975f4260a7f6e99 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Thu, 9 Jul 2015 16:59:55 +0200 Subject: [PATCH 03/15] remove live chat link on com --- app/templates/top.hbs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/templates/top.hbs b/app/templates/top.hbs index fc6a6a93..a62e3c5c 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -6,26 +6,23 @@ --}} - \ No newline at end of file + diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs index 28e09f9e..3d465e92 100644 --- a/app/templates/profile/accounts.hbs +++ b/app/templates/profile/accounts.hbs @@ -2,7 +2,7 @@
- +
{{#link-to 'profile'}} @@ -19,7 +19,7 @@ {{#link-to "account" view.account class="name"}}
- +

{{view.name}}

@@ -34,7 +34,7 @@ {{#if config.githubOrgsOauthAccessSettingsUrl}}

Is an organization missing?
- Review and add your authorized organizations.

+ Review and add your authorized organizations.

{{/if}} diff --git a/app/templates/profile/tabs.hbs b/app/templates/profile/tabs.hbs index 38c2a174..f7e232be 100644 --- a/app/templates/profile/tabs.hbs +++ b/app/templates/profile/tabs.hbs @@ -1,11 +1,11 @@
    -
  • +
  • {{#link-to "account" account}}Repositories{{/link-to}}
    • {{#if view.displayUser}} -
  • +
  • {{#link-to "accounts.info"}}Profile{{/link-to}}
    @@ -14,7 +14,7 @@ {{#if config.billingEndpoint}}
  • - Billing + Billing
    • {{/if}} diff --git a/app/templates/profile/tabs/user.hbs b/app/templates/profile/tabs/user.hbs index 8579dff7..b10cf139 100644 --- a/app/templates/profile/tabs/user.hbs +++ b/app/templates/profile/tabs/user.hbs @@ -1,4 +1,4 @@ -{{!-- +{{!--
    @@ -6,7 +6,7 @@ GitHub
    - {{user.login}} + {{user.login}}
    @@ -26,4 +26,4 @@
    - --}} \ No newline at end of file + --}} diff --git a/app/templates/queue.hbs b/app/templates/queue.hbs index ea147397..a2d70ec2 100644 --- a/app/templates/queue.hbs +++ b/app/templates/queue.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if length}} {{#each job in controller}} -
    +
    {{#if job.repo.slug}} - + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}} diff --git a/app/templates/repo.hbs b/app/templates/repo.hbs index baa24ed0..59131043 100644 --- a/app/templates/repo.hbs +++ b/app/templates/repo.hbs @@ -1,17 +1,17 @@ -
    +
    {{#if view.isEmpty}} {{view 'repos-empty'}} {{else}} {{#if repo.isLoaded}} -
    +

    {{#link-to "repo" repo}}{{repo.slug}}{{/link-to}}

    - + - +

    {{description}}

    diff --git a/app/templates/repos.hbs b/app/templates/repos.hbs index f69e9684..7bf3f1d4 100644 --- a/app/templates/repos.hbs +++ b/app/templates/repos.hbs @@ -22,10 +22,10 @@ {{#collection 'repos-list' content=this}} {{#with view.repo as repo}} -
    +

    {{#if repo.slug}} - + {{#link-to "repo" repo class="slug"}}{{repo.slug}}{{/link-to}} {{/if}}

    @@ -44,7 +44,7 @@

    Duration: - + {{format-duration repo.lastBuildDuration}}

    @@ -52,7 +52,7 @@

    Finished: - + {{format-time repo.lastBuildFinishedAt}}

    diff --git a/app/templates/repos/list/tabs.hbs b/app/templates/repos/list/tabs.hbs index 7faf4ba2..fc8723a8 100644 --- a/app/templates/repos/list/tabs.hbs +++ b/app/templates/repos/list/tabs.hbs @@ -1,16 +1,16 @@
      -
    • +
    • My Repositories
      • {{#if config.pro}} -
    • +
    • Running ({{startedJobsCount}}/{{allJobsCount}})
      • {{/if}} -
    • +
    • {{#link-to "profile" trackEvent="add-repository-from-list" title="Add New Repository"}} {{/link-to}} diff --git a/app/templates/repos/show/tabs.hbs b/app/templates/repos/show/tabs.hbs index d771665a..e6cae01c 100644 --- a/app/templates/repos/show/tabs.hbs +++ b/app/templates/repos/show/tabs.hbs @@ -1,34 +1,34 @@
        -
      • +
      • {{#if repo.slug}} {{#link-to "repo" repo current-when="repo.index"}} Current {{/link-to}} {{/if}}
        • -
      • +
      • {{#if repo.slug}} {{#link-to "branches" repo}} Branches {{/link-to}} {{/if}}
        • -
      • +
      • {{#if repo.slug}} {{#link-to "builds" repo}} Build History {{/link-to}} {{/if}}
        • -
      • +
      • {{#if repo.slug}} {{#link-to "pullRequests" repo}} Pull Requests {{/link-to}} {{/if}}
        • -
      • +
      • {{#if build.id}} {{#if repo.slug}} {{#link-to "build" repo build}} @@ -37,7 +37,7 @@ {{/if}} {{/if}}
        • -
      • +
      • {{#if job.id}} {{#if repo.slug}} {{#link-to "job" repo job}} @@ -46,14 +46,14 @@ {{/if}} {{/if}}
        • -
      • +
      • {{#if repo.slug}} {{#link-to "settings" repo}} Settings {{/link-to}} {{/if}}
        • -
      • +
      • {{#if repo.slug}} {{#link-to "requests" repo}} Requests @@ -61,7 +61,7 @@ {{/if}}
        • {{#if config.caches_enabled}} -
      • +
      • {{#if repo.slug}} {{#link-to "caches" repo}} Caches @@ -70,7 +70,7 @@
        • {{/if}} -
      • +
      • {{#if request.id}} {{#if repo.slug}} {{#link-to "request" repo request}} diff --git a/app/templates/request.hbs b/app/templates/request.hbs index 0f556e01..71c922c6 100644 --- a/app/templates/request.hbs +++ b/app/templates/request.hbs @@ -1,10 +1,10 @@ -
        +

        {{status}}{{#unless isAccepted}}: {{message}}{{/unless}}

        {{#if isPullRequest}} This request is based on the - #{{pullRequestNumber}} + #{{pullRequestNumber}} pull request. {{else}} This request is based on a commit {{format-commit commit}} by {{commit.authorName}} diff --git a/app/templates/requests.hbs b/app/templates/requests.hbs index 14a0bce2..603b2220 100644 --- a/app/templates/requests.hbs +++ b/app/templates/requests.hbs @@ -1,7 +1,7 @@ {{#if config.pro}}

        Travis Lint for clean .yml files - lint.travis-ci.org/{{repo.slug}} + lint.travis-ci.org/{{repo.slug}}

        {{/if}} diff --git a/app/templates/running-jobs.hbs b/app/templates/running-jobs.hbs index f4bf43f7..a04e187b 100644 --- a/app/templates/running-jobs.hbs +++ b/app/templates/running-jobs.hbs @@ -1,9 +1,9 @@ {{#if isLoaded}} {{#if controller.length}} {{#each job in controller}} -
        +
        {{#if job.repo.slug}} - + {{#link-to "job" job.repo job}}{{job.repo.slug}}{{/link-to}} {{/if}} @@ -17,7 +17,7 @@

        Duration: - + {{format-duration job.duration}}

        diff --git a/app/templates/settings/index.hbs b/app/templates/settings/index.hbs index eb576cb7..f373c693 100644 --- a/app/templates/settings/index.hbs +++ b/app/templates/settings/index.hbs @@ -15,7 +15,7 @@

        -

        +

        {{input value=settings.maximum_number_of_builds size="4" pattern='/^[0-9]+$/'}}

        - + Delete
        diff --git a/app/templates/top.hbs b/app/templates/top.hbs index fc6a6a93..4f82ad45 100644 --- a/app/templates/top.hbs +++ b/app/templates/top.hbs @@ -4,7 +4,7 @@
        -