Commit Graph

1734 Commits

Author SHA1 Message Date
Justine
52a3fa70e2 Merge pull request #222 from gregkare/align_line_numbers
Line numbers and log content should be aligned
2013-11-20 13:52:56 -08:00
Greg Karékinian
d5bb233df0 Align line numbers with CSS
It looks good up to 9999

Refs #222
2013-11-20 13:01:37 +01:00
Piotr Sarnacki
6f3d291d3e Allow to cancel build on pull permissions 2013-11-13 12:07:00 +01:00
Piotr Sarnacki
46e04c4f3f Restarts should be available for pull permissions as well 2013-11-12 17:41:27 +01:00
Sven Fuchs
eaf260a516 Revert "Display repos with no builds, but which are active in 'My repositories'"
This reverts commit fbed80f166.

Conflicts:
	assets/scripts/app/templates/repos/list.hbs
2013-11-12 16:06:26 +01:00
Piotr Sarnacki
028733df90 Use Win XP on sauce labs, also use latest browser version 2013-11-11 11:40:16 +01:00
Piotr Sarnacki
389f5d6b87 Merge pull request #219 from BanzaiMan/dev/hasari/granular_perms
Add granular permission levels to User
2013-11-07 09:26:35 -08:00
Hiro Asari
758ad40349 Fix typo 2013-11-07 11:50:12 -05:00
Hiro Asari
b72cc319cc Reduce number of AJAX requests 2013-11-06 15:57:16 -05:00
Hiro Asari
3f30eecc7d Add granular permission levels to User
Display buttons for job control only if the user has permission to do
so.
2013-11-06 15:00:46 -05:00
Sven Fuchs
6d52827576 timeago: assume "now" when date is in the future 2013-11-05 15:48:30 +01:00
Piotr Sarnacki
106c9e0776 Catch everything but '/' for status image redirect 2013-10-31 16:57:41 +01:00
Piotr Sarnacki
88c5bae9fc Don't redirect to api if we want something from images dir 2013-10-31 16:52:54 +01:00
Piotr Sarnacki
06d90dbc9b Merge branch 'master' into insufficient-oauth-permissions
Conflicts:
	assets/scripts/app/routes.coffee
2013-10-31 15:52:59 +01:00
Henrik Hodne
abe16b3c3b Merge pull request #218 from nschonni/patch-1
travisci.com to travis-ci.com
2013-10-30 10:16:41 -07:00
Nick Schonning
b21f9f82fb travisci.com to travis-ci.com
travisci.com emits a 301
2013-10-30 13:15:41 -04:00
Piotr Sarnacki
190bf9e837 Use lastBuildHash on repo, not lastBuild
lastBuildHash uses information for last build, which is available on the
repo object, so it will not trigger an ajax request if we haven't
fetched a build yet.
2013-10-30 14:36:32 +01:00
Piotr Sarnacki
018eafe84b Fix problem with getting started template rendering on first sync
When first sync template is displayed, user usually doesn't have any
repos, which also triggers rendering of getting started template. The
fix for this is to handle the action to render getting started page on
first sync and do nothing in such case.

I also added a test to ensure that it works correctly.
2013-10-29 20:48:27 +01:00
Piotr Sarnacki
a8fe524c00 Accidentaly commited change to ruby 2.0.0 2013-10-29 18:50:56 +01:00
Piotr Sarnacki
f089ee91a3 Merge branch 'show-active-repos' 2013-10-29 18:05:33 +01:00
Piotr Sarnacki
fbed80f166 Display repos with no builds, but which are active in 'My repositories'
When user activates a repository in the profile page, we now will
display this repository on the 'My Repositories' list. When user chooses
this repository, she will see an explenation why there is no builds and
what could be done to fix this.

Conflicts:
	assets/scripts/app/controllers.coffee
	assets/scripts/app/models/repo.coffee
	assets/scripts/app/templates/repos/list.hbs
2013-10-29 18:05:23 +01:00
Piotr Sarnacki
0bf5a413da Update lib8 and rubyracer 2013-10-29 17:12:03 +01:00
Justine Arreche
b100565048 removed smile from crying travis 2013-10-28 17:56:00 -04:00
Justine Arreche
745e2da628 modified travis-crying icon to have sad beard 2013-10-28 12:26:18 -04:00
Justine Arreche
de02f0d028 styling to github oauth error page and added travis-crying icon 2013-10-28 11:55:25 -04:00
Piotr Sarnacki
7363a1d7ef Render builds/not_found and repo/not_found in the next runloop run
This is done to make sure that if something else render just after
not_found, not_found will still be rendered.
2013-10-27 00:32:58 +02:00
Piotr Sarnacki
796e830a36 Add page about insufficient oauth permissions 2013-10-25 13:10:22 +02:00
Piotr Sarnacki
6a9510413d Use loading_link class instead of default loading on links
loading class conflicts with some of our CSS entries
2013-10-24 18:03:14 +02:00
Justine Arreche
15dc5ff921 added vertical align top to .slug 2013-10-21 21:19:37 -04:00
Justine Arreche
75ae8d7d14 Merge branch 'master' of https://github.com/travis-ci/travis-web 2013-10-21 20:04:30 -04:00
Justine Arreche
1210d07a90 changed #right .slug to inline 2013-10-21 20:04:13 -04:00
Piotr Sarnacki
b5297d7800 Update code for newest ember-model 2013-10-18 13:41:10 +02:00
Piotr Sarnacki
b3ce14cc22 Update ember to 1.1.beta and ember-model to newest version 2013-10-18 13:41:10 +02:00
Piotr Sarnacki
9958de3191 Add record to record arrays in adapter
Ember Model does not do it automatically. I had a patch, which was
changing that, but after giving it more thought, I think it's not a good
idea - this should be up to adapter if the records are going into
record arrays.
2013-10-18 13:41:09 +02:00
Justine Arreche
af65c668d1 bringing in darker #left div bg color for master app.css 2013-10-16 13:09:48 -04:00
Justine Arreche
9fb54749be darkened #left div a bit to reduce amount of white on page for people with less repos 2013-10-16 12:55:35 -04:00
Justine Arreche
14d7c0405c adding white color for anchors in flash messages 2013-10-15 13:58:46 -04:00
Justine Arreche
4bde44e40e added color white to flash class anchor tag 2013-10-15 13:45:56 -04:00
Justine Arreche
e5363fc64d added stylesheet ref for google fonts and added backup helvetica and sans-serif to app sass and getting started 2013-10-14 17:34:14 -04:00
Josh Kalderimis
c52719e9db add rel='stylesheet' to the google fonts link 2013-10-14 23:28:47 +02:00
Josh Kalderimis
4abee5edca remove some duplicated content due to a bad merge 2013-10-14 23:17:02 +02:00
Justine Arreche
e4190d0610 changed http to https to fix font issue in chrome and firefox for master 2013-10-14 12:20:59 -04:00
Justine Arreche
8a37d5dd6d changed http to https to fix font issue in chrome and firefox 2013-10-14 12:19:17 -04:00
Josh Kalderimis
c699d48337 Merge branch 'updated-styles' 2013-10-14 17:37:28 +02:00
Justine Arreche
b9a7916cf4 changed colors of build error/success messages to fit new color scheme, adjusted message positioning and added a white version of the close icon 2013-10-10 18:39:28 -04:00
Justine Arreche
3c90e42ecf fixed positioning of #profile right bar 2013-10-10 01:06:58 -04:00
Justine Arreche
3d8a72a074 fixed border colors for all tip boxes 2013-10-09 14:13:50 -04:00
Justine Arreche
3278b1e308 centerd tab titles 2013-10-09 13:14:11 -04:00
Justine Arreche
ced2bc63f6 fixed alignmnt of Mr. T 2013-10-08 16:57:17 -04:00
Justine Arreche
bdc84746f8 WIP - added inline-block to both span and .mascot in attemps to fix Mr. T 2013-10-08 15:48:09 -04:00