Commit Graph

87 Commits

Author SHA1 Message Date
Sven Fuchs
93b67a7cbb recompile 2012-09-26 22:25:43 +02:00
Sven Fuchs
0447f62a19 Merge branch 'new-router'
Conflicts:
	Gemfile.lock
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-26 22:21:34 +02:00
Sven Fuchs
192a2f44e1 filter pusher warnings about missing subscriptions 2012-09-26 22:15:54 +02:00
Piotr Sarnacki
7380fbcd59 Use history location 2012-09-26 21:08:09 +02:00
Sven Fuchs
f37fedd4aa fix for internal pusher events 2012-09-26 18:57:49 +02:00
Piotr Sarnacki
1134028996 Travis mostly works with new router
I haven't touched almost all of the things related to profile. I'm not
also sure what's the state of authentication at this point.

Conflicts:

	Gemfile
	Gemfile.lock
	Procfile
	assets/javascripts/app/app.coffee
	assets/javascripts/app/controllers.coffee
	assets/javascripts/app/controllers/auth.coffee
	assets/javascripts/app/controllers/profile.coffee
	assets/javascripts/app/routes.coffee
	assets/javascripts/app/templates/builds/list.hbs
	assets/javascripts/app/templates/builds/show.hbs
	assets/javascripts/app/templates/jobs/list.hbs
	assets/javascripts/app/templates/layouts/top.hbs
	assets/javascripts/app/templates/repos/list.hbs
	assets/javascripts/app/templates/repos/show/tabs.hbs
	assets/javascripts/app/templates/workers/list.hbs
	assets/javascripts/app/views.coffee
	assets/javascripts/app/views/repo/show.coffee
	assets/javascripts/travis.coffee
	public/index.html
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-26 16:30:16 +02:00
Konstantin Haase
04ab459077 also store token 2012-09-25 19:01:46 +02:00
Sven Fuchs
f3da6b8d5c use separate classes for display and display-inline 2012-09-24 14:06:04 +02:00
Sven Fuchs
a79b2e5183 clean out unused images, shrinken images, use a single ui image folder 2012-09-23 21:33:44 +02:00
Sven Fuchs
888427e611 get rid of the left bg image 2012-09-23 20:22:49 +02:00
Sven Fuchs
08bb056849 more tweaks 2012-09-23 18:54:31 +02:00
Sven Fuchs
41223f1ef2 css tweaks 2012-09-23 17:01:13 +02:00
Sven Fuchs
c327c3046d try a flex-box layout 2012-09-23 15:39:58 +02:00
Sven Fuchs
2db81d1685 fix hooks switch state and description line-height 2012-09-23 02:38:48 +02:00
Sven Fuchs
1eb33161a7 add a "to top" link 2012-09-23 01:44:15 +02:00
Sven Fuchs
92f6ff4adc stop autoscrolling on scroll up event, idea by courtesy of @rkh 2012-09-23 01:04:16 +02:00
Sven Fuchs
b40dfe044b optimize duration icon, further narrow the left column on small screens ESPECIALLY FOR JOSH 2012-09-23 00:39:26 +02:00
Sven Fuchs
04ecc5645f fix background color for empty space on the left bottom 2012-09-22 23:33:08 +02:00
Sven Fuchs
4cbd44c82f fix duration label icon/text switch 2012-09-22 23:22:51 +02:00
Sven Fuchs
0a867f8aad replace the help icon, glyphicons is the new famfamfam, right 2012-09-22 22:58:14 +02:00
Sven Fuchs
1142cbb194 fix z-index for tail button and main margin-right when sidebar collapsed 2012-09-22 22:19:37 +02:00
Sven Fuchs
efb810f1b3 improve paddings on the sign-in/out handle and drop down 2012-09-22 22:05:56 +02:00
Sven Fuchs
4eeb9356c6 fix unacceptable long user names 2012-09-22 21:33:15 +02:00
Sven Fuchs
15235c37e4 recompile 2012-09-22 21:19:21 +02:00
Sven Fuchs
4f52eea26d Merge branch 'master' of github.com:travis-ci/travis-ember
Conflicts:
	Gemfile.lock
	assets/javascripts/app/app.coffee
	assets/javascripts/app/auth.coffee
	assets/javascripts/app/store/rest_adapter.coffee
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-22 21:06:47 +02:00
Sven Fuchs
2bf04c5945 go back to the faux columns based layout 2012-09-22 21:03:08 +02:00
Konstantin Haase
4dfe5f70eb set origin for login 2012-09-22 17:46:29 +02:00
Sven Fuchs
cb6edc5b45 "fix" column heights, probably need a different approach to the 3-colum layout 2012-09-22 15:12:47 +02:00
Sven Fuchs
d872c6ae5d refactor app/auth stuff 2012-09-22 00:50:34 +02:00
Sven Fuchs
d1255d9230 refactor app/auth stuff 2012-09-21 17:28:53 +02:00
Sven Fuchs
2cbafde6c3 some fixes to the profile page 2012-09-20 17:30:10 +02:00
Sven Fuchs
7f2505a71a Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe
Conflicts:
	Gemfile.lock
	assets/javascripts/lib/travis/auth.coffee
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-20 17:06:25 +02:00
Sven Fuchs
1b78187b2f signin spinner, needs a better gif 2012-09-20 17:03:46 +02:00
Konstantin Haase
7c975054b7 Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe
Conflicts:
	public/javascripts/application.js
2012-09-19 16:38:10 +02:00
Sven Fuchs
d2bfd50f5a recompile 2012-09-19 16:24:54 +02:00
Sven Fuchs
cbe13f0bb7 Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-19 16:23:58 +02:00
Sven Fuchs
1b26f2d945 use status colors for worker status 2012-09-19 15:34:11 +02:00
Sven Fuchs
ab52e15ab1 fix underline issue with status icons in links 2012-09-19 14:47:42 +02:00
Sven Fuchs
e4fc61b562 add monster media queries 2012-09-19 14:20:58 +02:00
Konstantin Haase
3b6dc64fd4 change display while signing in 2012-09-19 13:25:03 +02:00
Sven Fuchs
3fa52d627f recompile 2012-09-19 13:16:35 +02:00
Sven Fuchs
f7021fa7e6 optimize status colors and expand/collapse icons 2012-09-19 13:15:13 +02:00
Sven Fuchs
87104a485d somewhat liquid layout 2012-09-19 13:15:01 +02:00
Sven Fuchs
4b888a7301 recompile 2012-09-19 13:14:39 +02:00
Sven Fuchs
0d86a7f196 tweak colors and font-sizes 2012-09-19 13:14:02 +02:00
Konstantin Haase
54a1cf72a8 use localStorage for a log in flag, use sessionStorage to keep user data 2012-09-19 11:16:00 +02:00
Sven Fuchs
b3c310d51d Merge branch 'sf-auth-iframe' of github.com:travis-ci/travis-ember into sf-auth-iframe
Conflicts:
	public/stylesheets/application.css
2012-09-18 20:31:24 +02:00
Konstantin Haase
93d1e9f66f listen for post messages 2012-09-18 18:28:11 +02:00
Sven Fuchs
6377d20d4d more styles cleanup 2012-09-18 17:12:57 +02:00
Sven Fuchs
f2c72926bd clean up styles 2012-09-18 14:18:25 +02:00