From 7adf8648e8c819ad1c250f99afe86efe68aa3ae5 Mon Sep 17 00:00:00 2001 From: Laurent Goderre Date: Thu, 13 Dec 2012 10:44:38 -0500 Subject: [PATCH 01/37] Removed the unused font-face declararation. Not needed since 754be38 (See issue #72) --- assets/styles/app.sass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/assets/styles/app.sass b/assets/styles/app.sass index 51fc0e05..efb64d62 100644 --- a/assets/styles/app.sass +++ b/assets/styles/app.sass @@ -1,12 +1,5 @@ @import "_mixins/all" -@font-face - font-family: 'Glyphicons Halflings' - src: url('/fonts/glyphiconshalflings-regular.eot') - src: url('/fonts/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), url('/fonts/glyphiconshalflings-regular.woff') format('woff'), url('/fonts/glyphiconshalflings-regular.ttf') format('truetype'), url('/fonts/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg') - font-weight: normal - font-style: normal - html, body font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif font-size: $font-size-small From fa7f8b933270e21e86bb906d7d2b271ea405cde9 Mon Sep 17 00:00:00 2001 From: Randy Morgan Date: Fri, 14 Dec 2012 19:31:05 +0900 Subject: [PATCH 02/37] Added first level instrumentation for travis-web This is not enabled by default. You need to run: Travis.Instrumentation.subscribe('render.view') To start capturing info --- assets/scripts/app/app.coffee | 1 + assets/scripts/lib/travis/instrumentation.coffee | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 assets/scripts/lib/travis/instrumentation.coffee diff --git a/assets/scripts/app/app.coffee b/assets/scripts/app/app.coffee index 8aaf0ba5..d1958e3c 100644 --- a/assets/scripts/app/app.coffee +++ b/assets/scripts/app/app.coffee @@ -13,6 +13,7 @@ require 'views' require 'config/locales' require 'data/sponsors' +require 'travis/instrumentation' # $.mockjaxSettings.log = false # Ember.LOG_BINDINGS = true # Ember.ENV.RAISE_ON_DEPRECATION = true diff --git a/assets/scripts/lib/travis/instrumentation.coffee b/assets/scripts/lib/travis/instrumentation.coffee new file mode 100644 index 00000000..1e9c9b17 --- /dev/null +++ b/assets/scripts/lib/travis/instrumentation.coffee @@ -0,0 +1,8 @@ +Travis.Instrumentation = { + subscribe: (event) -> + Em.subscribe event, + before:(name, timestamp, payload) -> + timestamp + after: (name, timestamp, payload, start_timestamp) -> + console.log(name, payload, timestamp - start_timestamp) +} From f326960f9aad1eed856a991f1d93b76b16936e36 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Mon, 17 Dec 2012 15:19:22 +0100 Subject: [PATCH 03/37] check for token --- assets/scripts/app/auth.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 0be5b826..5fd39052 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -35,7 +35,7 @@ null validateUser: (user) -> - @validateHas('id', user) && @validateHas('login', user) #&& @validateHas('token', user) + @validateHas('id', user) && @validateHas('login', user) && @validateHas('token', user) validateHas: (field, user) -> if user[field] From 207c8eb7e91fb77db4b7ac23116da42aa7c03ab6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 17 Dec 2012 19:45:25 +0100 Subject: [PATCH 04/37] Fix translations for accounts and signing_in --- .localeapp/log.yml | 4 ++-- locales/en.yml | 4 ++-- locales/nl.yml | 8 ++++---- locales/ru.yml | 14 +++++++------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.localeapp/log.yml b/.localeapp/log.yml index fce063a3..0be37648 100644 --- a/.localeapp/log.yml +++ b/.localeapp/log.yml @@ -1,3 +1,3 @@ --- -:polled_at: 1355238733 -:updated_at: 1355238733 +:polled_at: 1355769955 +:updated_at: 1355769955 diff --git a/locales/en.yml b/locales/en.yml index a6c1218f..4eb8f3bb 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -110,7 +110,7 @@ en: show: email: Email github: Github - locale: locale + locale: Locale message: config: how to configure custom build options your_repos: ! " Flick the switches below to turn on the Travis service hook for your projects, then push to GitHub.
\n To test against multiple rubies, see" @@ -123,7 +123,7 @@ en: your_repos: Your Repositories queue: Queue repositories: - asciidoc: AsciiDoc + asciidoc: asciidoc branch: Branch commit: Commit duration: Duration diff --git a/locales/nl.yml b/locales/nl.yml index 6580ef3e..1648eb8d 100644 --- a/locales/nl.yml +++ b/locales/nl.yml @@ -7,7 +7,7 @@ nl: allowed_failures: Toegestane mislukkingen author: Auteur branch: Tak - build_matrix: Bouw Matrix + build_matrix: Bouw matrix commit: Commit committer: Committer compare: Vergelijk @@ -84,7 +84,7 @@ nl: job: Taak log: Logboek top: - accounts: + accounts: accounts admin: Administratie blog: Blog docs: Documentatie @@ -110,7 +110,7 @@ nl: show: email: Email adres github: Github - locale: + locale: Taal message: config: hoe eigen bouw-opties in te stellen your_repos: ! 'Zet de schakelaars hieronder aan om de Travis hook voor uw projecten te activeren en push daarna naar Github
@@ -141,7 +141,7 @@ nl: build_history: Bouw geschiedenis current: Huidig job: Taak - pull_requests: + pull_requests: Pull Requests test: textile: Textile repository: diff --git a/locales/ru.yml b/locales/ru.yml index 9ff2759a..38540341 100644 --- a/locales/ru.yml +++ b/locales/ru.yml @@ -19,7 +19,7 @@ ru: sponsored_by: Эта серия тестов была запущена на машине, спонсируемой name: Билд started_at: Начало - state: + state: состояние datetime: distance_in_words: hours_exact: @@ -58,9 +58,9 @@ ru: message: Комментарий messages: sponsored_by: Эта серия тестов была запущена на машине спонсируемой - sponsored_by: + sponsored_by: Спонсоры started_at: Начало - state: + state: состояние layouts: about: alpha: Это альфа-версия @@ -90,7 +90,7 @@ ru: job: Задача log: Журнал top: - accounts: + accounts: аккаунты admin: Управление blog: Блог docs: Документация @@ -98,7 +98,7 @@ ru: home: Главная profile: Профиль sign_out: Выход - signing_in: + signing_in: авторизация stats: Статистика locales: ca: @@ -116,7 +116,7 @@ ru: show: email: Электронная почта github: Github - locale: + locale: Язык message: config: как настроить специальные опции билда your_repos: ! 'Используйте переключатели, чтобы включить Travis service hook для вашего проекта, а потом отправьте код на GitHub.
@@ -131,7 +131,7 @@ ru: your_repos: Ваши репозитории queue: Очередь repositories: - asciidoc: + asciidoc: asciidoc branch: Ветка commit: Коммит duration: Длительность From 7ce690aecf3f5e08d682c81334e527b2bb142374 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Mon, 17 Dec 2012 19:58:34 +0100 Subject: [PATCH 05/37] add logging --- assets/scripts/app/auth.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 5fd39052..986e693d 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -72,6 +72,7 @@ path receiveMessage: (event) -> + console.log(event) if event.origin == @expectedOrigin() if event.data == 'redirect' window.location = "#{@endpoint}/auth/handshake?redirect_uri=#{location}" From 12c84d83595461151063a37b5c47ca32da474164 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Mon, 17 Dec 2012 20:09:49 +0100 Subject: [PATCH 06/37] more logging in auth --- assets/scripts/app/auth.coffee | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee index 986e693d..90d002ff 100644 --- a/assets/scripts/app/auth.coffee +++ b/assets/scripts/app/auth.coffee @@ -6,6 +6,7 @@ window.addEventListener('message', (e) => @receiveMessage(e)) signOut: -> + console.log('auth.signOut') Travis.storage.removeItem('travis.locale') Travis.storage.removeItem('travis.user') Travis.storage.removeItem('travis.token') @@ -15,11 +16,13 @@ @set('user', undefined) signIn: -> + console.log('auth.signIn') @set('state', 'signing-in') url = "#{@endpoint}/auth/post_message?origin=#{@receivingEnd}" $('