Commit Graph

3949 Commits

Author SHA1 Message Date
Sven Fuchs
b776f1355b recompile 2012-09-27 00:58:10 +02:00
Sven Fuchs
7bf2551990 Merge branch 'master' of github.com:travis-ci/travis-ember
Conflicts:
	public/javascripts/application.js
2012-09-27 00:46:00 +02:00
Sven Fuchs
87cf494c26 fix parameter name for builds "load more" 2012-09-27 00:45:27 +02:00
Piotr Sarnacki
164b8d22cc Don't load sponsors data twice 2012-09-27 00:21:35 +02:00
Sven Fuchs
412176975b fix popup 2012-09-27 00:06:32 +02:00
Sven Fuchs
ecf0088557 remove hash mark from repo list 2012-09-27 00:01:03 +02:00
Sven Fuchs
b96bafee5c add status to job summary 2012-09-27 00:00:49 +02:00
Sven Fuchs
ad120fb613 fix popup link 2012-09-27 00:00:13 +02:00
Sven Fuchs
958e7948d1 ignore more pusher warnings 2012-09-26 23:59:03 +02:00
Piotr Sarnacki
fe7f07629f Use regular views in sidebar instead of outlets
Outlets behaved weird in this place (not sure why, maybe because it's
deeply nested) and we don't need to change those views anyway.
2012-09-26 23:32:55 +02:00
Piotr Sarnacki
5b2aae19b3 Try to defer sidebar loading a little bit 2012-09-26 23:32:36 +02:00
Sven Fuchs
1a9f88587d fix some links/action targets 2012-09-26 23:18:11 +02:00
Sven Fuchs
5a49b51700 tweak greens 2012-09-26 22:43:09 +02:00
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
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