diff --git a/Gemfile.lock b/Gemfile.lock index eaa5a4b3..65e1a899 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 3154d3fbfa6fe4202ade27f5712927b72dc1673b + revision: db8effd212dd008248ba972f5da7818f39dd4255 branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/images/ui/activate.png b/assets/images/ui/activate.png new file mode 100644 index 00000000..6219207d Binary files /dev/null and b/assets/images/ui/activate.png differ diff --git a/assets/images/ui/activated.png b/assets/images/ui/activated.png new file mode 100644 index 00000000..53a808f0 Binary files /dev/null and b/assets/images/ui/activated.png differ diff --git a/assets/images/ui/off.png b/assets/images/ui/off.png deleted file mode 100644 index bee0a650..00000000 Binary files a/assets/images/ui/off.png and /dev/null differ diff --git a/assets/images/ui/on.png b/assets/images/ui/on.png deleted file mode 100644 index f0626a6f..00000000 Binary files a/assets/images/ui/on.png and /dev/null differ diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index 24b95724..3f3a3b68 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -20,11 +20,6 @@ require 'travis/model' commit: DS.belongsTo('Travis.Commit', key: 'commit_id') log: DS.belongsTo('Travis.Artifact', key: 'log_id') - isQueued: (-> - # wat. - # console.log(@get('state')) - ).property('state') - config: (-> Travis.Helpers.compact(@get('data.config')) ).property('data.config') @@ -62,7 +57,7 @@ require 'travis/model' @find() Travis.app.store.filter this, (job) -> queued = ['created', 'queued'].indexOf(job.get('state')) != -1 - queued && job.get('queue') == "builds.#{queue}" + queued && (!queue || job.get('queue') == "builds.#{queue}") findMany: (ids) -> Travis.app.store.findMany this, ids diff --git a/assets/scripts/app/templates/profile/accounts.hbs b/assets/scripts/app/templates/profile/accounts.hbs index 8bde616f..98a14a44 100644 --- a/assets/scripts/app/templates/profile/accounts.hbs +++ b/assets/scripts/app/templates/profile/accounts.hbs @@ -12,7 +12,7 @@ {{view.name}}

Repositories: - {{view.content.reposCount}} + {{view.account.reposCount}}

{{/collection}} diff --git a/assets/scripts/app/templates/profile/tabs/hooks.hbs b/assets/scripts/app/templates/profile/tabs/hooks.hbs index d034f182..a3666197 100644 --- a/assets/scripts/app/templates/profile/tabs/hooks.hbs +++ b/assets/scripts/app/templates/profile/tabs/hooks.hbs @@ -10,9 +10,9 @@ {{else}}

Last synchronized from GitHub: {{formatTime user.syncedAt}} - +