Commit Graph

285 Commits

Author SHA1 Message Date
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
ccb4e27bdc Update ember and get initialState back 2012-09-26 22:06:28 +02:00
Piotr Sarnacki
493cdae009 New ember version 2012-09-26 22:06:05 +02:00
Sven Fuchs
9ca03aebb6 fix pusher subscription 2012-09-26 21:50:38 +02:00
Sven Fuchs
060812b65d catch pusher unsubscribe exceptions 2012-09-26 21:43:56 +02:00
Piotr Sarnacki
b33f4d88aa Remove initialStates from router 2012-09-26 21:08:09 +02:00
Piotr Sarnacki
7380fbcd59 Use history location 2012-09-26 21:08:09 +02:00
Sven Fuchs
11f663e03f switch to history location 2012-09-26 19:08:35 +02:00
Sven Fuchs
f37fedd4aa fix for internal pusher events 2012-09-26 18:57:49 +02:00
Piotr Sarnacki
0885cdf674 Plug proper layouts and links on profile view 2012-09-26 18:18:47 +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
Sven Fuchs
f8ac1ba75b bump travis-api 2012-09-26 15:18:43 +02:00
Piotr Sarnacki
b31515fa57 Update ember and ember-data 2012-09-26 15:07:52 +02:00
Piotr Sarnacki
6207eecbcf Add foreman and rerun to Gemfile 2012-09-26 15:06:34 +02:00
Sven Fuchs
af02f2b2f3 fix hooks, sync and try fixing locale 2012-09-26 12:34:40 +02:00
Sven Fuchs
be40b8e45a Merge branch 'master' of github.com:travis-ci/travis-ember 2012-09-25 21:42:24 +02:00
Konstantin Haase
effb79fd66 update pusher 2012-09-25 21:12:36 +02:00
Sven Fuchs
fa45c37bba recompile 2012-09-25 19:26:07 +02:00
Sven Fuchs
c2fdbea175 Merge branch 'master' of github.com:travis-ci/travis-ember
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-25 19:23:03 +02:00
Konstantin Haase
04ab459077 also store token 2012-09-25 19:01:46 +02:00
Konstantin Haase
56afbd7840 remove empty line 2012-09-25 16:48:02 +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
5862bbe3df fix nil api_endpoint 2012-09-23 16:02:33 +02:00
Sven Fuchs
bd6e1d3b0f bump deps 2012-09-23 15:45:59 +02:00
Sven Fuchs
f06b412bb6 Merge branch 'sf-flex-layout' 2012-09-23 15:43:33 +02:00
Sven Fuchs
c327c3046d try a flex-box layout 2012-09-23 15:39:58 +02:00
Konstantin Haase
272ba92994 Merge branch 'master' of github.com:travis-ci/travis-ember 2012-09-23 10:58:06 +02:00
Konstantin Haase
5b092e9ec4 default to running against api.travis-ci.org 2012-09-23 10:53:00 +02:00
Sven Fuchs
dc9881dbc8 Merge branch 'master' of github.com:travis-ci/travis-ember
Conflicts:
	public/javascripts/application.js
2012-09-23 03:22:54 +02:00
Sven Fuchs
89cb0c81c8 extract slider toggle cuz i can't get an ember mixin working 2012-09-23 03:18:54 +02:00
Konstantin Haase
275f4f0caa Merge branch 'rkh-pusher' 2012-09-23 02:46:25 +02:00
Konstantin Haase
7ce79917dd Merge branch 'master' into rkh-pusher
Conflicts:
	public/javascripts/application.js
	public/stylesheets/application.css
2012-09-23 02:45:21 +02:00
Konstantin Haase
37c231712e no longer override Travis.Model#get 2012-09-23 02:44:27 +02:00
Sven Fuchs
2db81d1685 fix hooks switch state and description line-height 2012-09-23 02:38:48 +02:00
Konstantin Haase
8104c833f6 Merge branch 'master' into rkh-pusher
Conflicts:
	public/javascripts/application.js
2012-09-23 02:33:58 +02:00
Konstantin Haase
7b5e8445bc load pusher key from api endpoing (allows running locally against api.travis-ci.org) 2012-09-23 02:31:32 +02:00
Sven Fuchs
ef9b34b235 fix persisting the minimized sidebar status 2012-09-23 02:22:13 +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