Piotr Sarnacki
0679fc260c
Revert "Revert "Use switches on settings pane""
...
This reverts commit e5ae06afeb
.
2014-02-12 17:33:42 +01:00
Henrik Hodne
e5ae06afeb
Revert "Use switches on settings pane"
...
This reverts commit 357b176f93
.
This commit seems to be where the bug with enabling hooks was
introduced, and reverting this commit seems to fix that bug.
Conflicts:
assets/scripts/app/controllers.coffee
assets/scripts/app/templates/repo/settings.hbs
2014-02-12 09:55:24 -06:00
Henrik Hodne
2450f9fe9d
Revert previous revert
...
I found the commit that caused the bug that caused me to do the last
revert. I'm therefore reverting the previous revert and I will be
committing a revert that reverts the commit that introduced the bug. See
next commit.
This reverts commit db2d38a7af
.
2014-02-12 09:54:24 -06:00
Henrik Hodne
db2d38a7af
Revert setting panel deploy
...
This seems to have caused issues with enabling the hooks for
repositories.
2014-02-12 09:14:47 -06:00
Piotr Sarnacki
3426a8b95f
Notify only on error when saving settings
2014-02-12 13:17:26 +01:00
Piotr Sarnacki
8d19410264
Merge remote-tracking branch 'origin/settings-pane'
...
Conflicts:
assets/scripts/app/controllers.coffee
assets/scripts/app/routes.coffee
assets/scripts/app/views/repo/show.coffee
2014-02-12 11:52:01 +01:00
Piotr Sarnacki
f29ee2372a
Fix specs
...
Change in mocks.coffee broken specs - using repos variable was shadowing
global repos array.
2014-02-12 10:37:07 +01:00
Piotr Sarnacki
ce74220f28
Don't reopen Ember.Route
...
A better way is to provide Travis.Route, which will be used by default
when generating route objects.
There is also no need to define actions for all the routes as they are
needed only in ApplicationRoute (ie. when they're not handled by other
routes).
2014-02-12 08:55:55 +01:00
Piotr Sarnacki
e5749b0629
Fix handling not existing repos
...
Also ensure that we don't break it again with an integration test.
2014-02-12 08:02:47 +01:00
Piotr Sarnacki
a8784a58fa
Use index/loading template instead of IndexLoadingRoute
...
By default Ember.js will use either IndexLoadingRoute or index/loading
template. Before this commit we were specyfing IndexLoadingRoute, which
was renderring index_loading template. This is not needed as long as we
use index/loading template - the effect is the same, but we use a
default.
2014-02-12 07:48:44 +01:00
Piotr Sarnacki
03e8745dc3
Bubble the error to top if we don't handle it in Ember.Route
...
A proper thing to do when an error is not handled is to bubble it up
rather than using throw (which we were using before this commit).
2014-02-12 07:46:56 +01:00
Piotr Sarnacki
71e5959f4e
Properly handle notFound URL
...
We handled notFound URL using an old hack, which no longer works. The
proper way now is to handle a "catch all" route.
2014-02-12 07:45:32 +01:00
Henrik Hodne
31d77c1ad9
Merge pull request #255 from travis-ci/hh-switch-restart-endpoint
...
fix(models): update the endpoint used to restart jobs and builds
2014-02-10 14:15:46 -06:00
Hiro Asari
738b5a8209
Merge pull request #257 from rjackson/update-ember
...
Update Ember to mitigate CVE-2014-0046.
2014-02-07 17:43:00 -05:00
Robert Jackson
10d9317f5f
Update Ember to mitigate CVE-2014-0046.
...
Details here:
https://groups.google.com/forum/#!topic/ember-security/1h6FRgr8lXQ
2014-02-07 15:36:44 -05:00
Henrik Hodne
1b7aba494a
fix(models): update the endpoint used to restart jobs and builds
...
/requests is deprecated
2014-01-30 17:19:15 -06:00
Piotr Sarnacki
8e3134d495
Update log engine
2014-01-29 14:43:44 +01:00
Piotr Sarnacki
803c7d0278
Fix flex CSS
...
We used flex CSS features from both old and new specification.
Furthermore, we weren't using moz and ms prefixes for a new model, which
may have also made it worse in IE and Firefox.
This commit changes CSS to use new flexbox implementation with all the
prefixes (which should not be needed for current versions, but it won't
hurt to keep them for a while).
2014-01-29 14:35:59 +01:00
Piotr Sarnacki
0d40f2322e
Merge pull request #245 from dmathieu/refactor_folder
...
Refactor the log folder and test the logs view
2014-01-29 02:49:58 -08:00
Damien Mathieu
5ef0302243
automatically unfold lines starting or ending an highlight
2014-01-29 09:10:50 +01:00
Hiro Asari
e884e6d013
Merge pull request #253 from travis-ci/hh-show-status-image-popup-everyone
...
feat(repo-tools): show status image popup to everyone
2014-01-28 19:31:35 -08:00
Henrik Hodne
e716c5d569
feat(repo-tools): show status image popup to everyone
...
If you can see the repository, then you should also be able to see the
status of said repository (and status image), so you should also be able
to copy the link to a status image.
Close travis-ci/travis-ci#1881 .
2014-01-28 19:46:30 -06:00
Piotr Sarnacki
5562e72492
Update ember-model
2014-01-28 22:41:51 +01:00
Piotr Sarnacki
c808d3d3b8
Add sideloaded records to record arrays
2014-01-28 22:41:50 +01:00
Mathias Meyer
af07dfb29e
Remove console.log of language.
2014-01-28 20:58:01 +01:00
Hiro Asari
1987a97ec1
Add missing header for pull request
2014-01-28 12:21:11 -05:00
Hiro Asari
1cbf3ffc1e
Fix message that got mangled by the locale removal [skip ci]
2014-01-28 12:06:47 -05:00
Damien Mathieu
9571ce09e3
add integration specs to the log view
2014-01-28 17:23:15 +01:00
Damien Mathieu
6608032652
refactor and test the log folder
2014-01-28 17:23:15 +01:00
Hiro Asari
2c079ae937
Label Rst and POD correctly
2014-01-28 09:57:54 -05:00
Piotr Sarnacki
c3008c1f78
Add mappings for sideloading annotations
2014-01-28 15:33:22 +01:00
Mathias Meyer
36ee4c183c
Fix links to point to new documentation site.
2014-01-28 12:42:26 +01:00
Mathias Meyer
6254fa9664
It's GitHub.
2014-01-28 12:42:17 +01:00
Hiro Asari
853a59141f
Remove top border for annotations [skip ci]
2014-01-27 14:15:34 -05:00
Hiro Asari
e00b938f4d
Merge pull request #190 from travis-ci/hh-annotations
...
Annotation support (#1220 )
2014-01-27 08:41:52 -08:00
Piotr Sarnacki
82b9df2fef
Capitalize labels in job and build headers
2014-01-27 13:24:50 +01:00
Piotr Sarnacki
360b32a4f2
Merge branch 'updated-styles'
...
Conflicts:
assets/scripts/app/templates/layouts/top.hbs
assets/scripts/app/templates/repos/list.hbs
2014-01-27 13:02:05 +01:00
Hiro Asari
634fca454e
Use bind-attr instead of the deprecated bindAttr
2014-01-25 17:29:56 -05:00
Hiro Asari
62fd40f51e
Tell TravisApplication about the Annotation model
2014-01-25 17:14:35 -05:00
Hiro Asari
dbba183564
Change port for localhost example [skip ci]
2014-01-25 09:08:30 -05:00
Hiro Asari
26c5cf2a05
Add status image example for POD
...
Fixes https://github.com/travis-ci/travis-web/issues/235
Note the height attribute is removed from `#status-image`.
We now let browser decide how tall the popup will be.
2014-01-25 09:06:25 -05:00
Hiro Asari
364fb119c9
Add newline
2014-01-24 10:32:42 -05:00
Hiro Asari
715b1a2d36
Drop image and add status for Annotation
2014-01-24 10:32:11 -05:00
Hiro Asari
9e2a8cb218
Merge branch 'master' into hh-annotations
...
Conflicts:
assets/scripts/app/controllers/job.coffee
assets/scripts/app/models/job.coffee
2014-01-24 10:18:58 -05:00
Justine Arreche
7d9db8cbae
restyled general settings
2014-01-24 10:04:12 -05:00
Piotr Sarnacki
357b176f93
Use switches on settings pane
2014-01-21 18:46:36 +01:00
Piotr Sarnacki
d41d6de175
Merge branch 'master' into settings-pane
...
Conflicts:
assets/scripts/app/templates/profile/tabs/hooks.hbs
2014-01-21 18:01:42 +01:00
Piotr Sarnacki
8e5111da88
Convert switches in profile to components
2014-01-21 17:57:35 +01:00
Piotr Sarnacki
d7bef2b94e
Revert tailing changes
2014-01-20 15:00:34 +01:00
Piotr Sarnacki
492802920e
Use pushState to set urls
...
It seems that directly setting location.hash directly doesn't play nice
with Ember.js URL handling - using it to handle line numbers results in
weird bugs (URL stops being updated after setting hash manually).
This commit gets back to using window.history.pushState() which was
changed to direct hash manipulation in ff1aad3
2014-01-20 14:24:05 +01:00