Commit Graph

599 Commits

Author SHA1 Message Date
Piotr Sarnacki
92f843208a Revert "It's free and hosted, not distributed!"
This reverts commit 873c8aefa6.
2012-11-05 22:27:54 +01:00
Mathias Meyer
873c8aefa6 It's free and hosted, not distributed! 2012-11-02 13:26:20 +01:00
Piotr Sarnacki
74aa8ed503 Remove public/version from git 2012-10-30 02:30:45 +01:00
Piotr Sarnacki
9e53ee4aa4 Remove compiled scripts and styles from repo 2012-10-30 02:27:29 +01:00
Piotr Sarnacki
73055be147 Merge branch 'deployment-plus-plus'
Conflicts:
	assets/scripts/lib/travis/expandable_record_array.coffee
	public/scripts/app.js
	public/scripts/min/app.js
	public/styles/app.css
	public/version
2012-10-30 02:25:02 +01:00
Piotr Sarnacki
be2a1cf8a3 Use isComplete on build page to not show incomplete record 2012-10-30 02:23:41 +01:00
Piotr Sarnacki
d1ab28abcc Remove console.log entry 2012-10-30 02:23:41 +01:00
Piotr Sarnacki
3a1cb7444c Move rakep and dependencies out of development 2012-10-30 02:21:10 +01:00
Piotr Sarnacki
f39dcff13b Compile assets for production 2012-10-28 23:45:27 +01:00
Piotr Sarnacki
5ae7e1d046 Check also associations for incomplete records 2012-10-28 23:43:17 +01:00
Piotr Sarnacki
4c1c4586fa Handle case where key on data needs Ember.set
I'm not really sure what cauese a field to be defined as such setter,
but it sometimes happens.
2012-10-28 23:43:17 +01:00
Piotr Sarnacki
fee6fc6cad payload.job.id is not always present in worker:updated event 2012-10-28 23:43:16 +01:00
Piotr Sarnacki
d3d7f6b83c Don't add repository on worker events if it already exists
It's best to do that, because worker payload is usually outdated. If
there is no info on repo yet, it's worth to add it, but if it already
exists, we will most likely end up with inconsistent situation.
2012-10-28 23:43:16 +01:00
Piotr Sarnacki
987185be54 Fix build link when updating builds through pusher 2012-10-28 23:43:16 +01:00
Piotr Sarnacki
3f0babcf55 Fix adding builds to a build list on pusher event 2012-10-28 23:43:15 +01:00
Piotr Sarnacki
6b40f127a1 Check also associations for incomplete records 2012-10-27 04:45:57 +02:00
Piotr Sarnacki
a8e85dc714 Handle case where key on data needs Ember.set
I'm not really sure what cauese a field to be defined as such setter,
but it sometimes happens.
2012-10-27 03:50:16 +02:00
Piotr Sarnacki
63e2a9add6 payload.job.id is not always present in worker:updated event 2012-10-27 03:43:01 +02:00
Piotr Sarnacki
40ef7107f4 Don't add repository on worker events if it already exists
It's best to do that, because worker payload is usually outdated. If
there is no info on repo yet, it's worth to add it, but if it already
exists, we will most likely end up with inconsistent situation.
2012-10-27 03:11:15 +02:00
Piotr Sarnacki
94bff24f2c Fix build link when updating builds through pusher 2012-10-27 00:50:34 +02:00
Piotr Sarnacki
5eb3ab3b01 Fix adding builds to a build list on pusher event 2012-10-26 22:35:10 +02:00
Piotr Sarnacki
a7faec7479 Make sure that repo.slug is loaded for queue urls 2012-10-24 22:37:24 +02:00
Piotr Sarnacki
231f3b8723 Load worker related records from pusher payload 2012-10-24 11:28:01 +02:00
Piotr Sarnacki
7f979c8a5e Add minified app.js 2012-10-23 23:39:12 +02:00
Konstantin Haase
a1fb0ff2be bump up auth timeout 2012-10-23 21:25:22 +02:00
Piotr Sarnacki
14e8827e36 Generate production version 2012-10-23 03:47:26 +02:00
Piotr Sarnacki
a63ac52458 Remove layout views, just change template on application 2012-10-23 01:40:05 +02:00
Piotr Sarnacki
939212302a Fix loading page with #L<line-number>
Ember changed a way HistoryLocation works and it no longer calls
getURL(). I'm monkey patching it, but I will submit a pull request to
fix it.
2012-10-22 21:45:43 +02:00
Piotr Sarnacki
349a4d104e Fix scrolling issues for 'Follow logs' 2012-10-22 21:30:26 +02:00
Piotr Sarnacki
72f14fb594 Do not trigger unnecessary reloads when locale *could* have changed 2012-10-22 21:29:51 +02:00
Piotr Sarnacki
3fdd2d50ab Get back to old version of log number scrolling 2012-10-22 21:29:14 +02:00
Konstantin Haase
87e8f32637 Merge branch 'master' of github.com:travis-ci/travis-web
Conflicts:
	public/version
2012-10-22 21:25:22 +02:00
Konstantin Haase
5a772a0710 update app.css 2012-10-22 21:23:50 +02:00
Piotr Sarnacki
c02f4d860b Fix errors with reload 2012-10-22 19:54:53 +02:00
Piotr Sarnacki
300ad58516 Fix incomplete implementation
While testing in the wild I spotted a few problems with it:

* it didn't work for camel case names.
* it was sometimes setting loaded data too late - it needed to use find
  and then save data on the record. Instead it should save data in
  special array saved on store, indexed by clientId
* there is already method to get attributes in ember-data, it just
  doesn't work with Travis.Foo.get('attributes'), it needs
  Ember.get(Travis.Foo, 'attributes') - it makes implementation much
  shorter
2012-10-22 02:54:48 +02:00
Piotr Sarnacki
6cfddfd882 Change log.isLoaded to view.job.log.isLoaded
For some weird reason Ember errors out when it's called directly on
context (which is job in this place).
2012-10-21 20:48:24 +02:00
Piotr Sarnacki
6513d5c675 Update ember.js 2012-10-21 18:53:52 +02:00
Piotr Sarnacki
60740a8d3d Remove router hacks
I've implemented things that we need into Ember. We're running from my
fork for now, ideally those changes will be merged into official repo.
2012-10-20 16:36:53 +02:00
Piotr Sarnacki
0587991533 Fix scrolling to line numbers
After some of the layout changes, the element that actually gets
scrolled is current layout view (.application > div).
2012-10-20 15:43:17 +02:00
Piotr Sarnacki
af00392d15 Fix jobs table when jobs have different config keys
If we have 2 jobs within 1 build, with such config values:

    { rvm: 'jruby-head', jdk: 'oraclejdk7' }
    { rvm: '1.9.3', jdk: null }

We should return jdk in configValues for second build, even if it's not
present. Otherwise table rows may be missing.

(closes #28)
2012-10-20 02:14:17 +02:00
Sven Fuchs
f790a809ff remove debug output 2012-10-19 22:24:57 +02:00
Sven Fuchs
853606bcc6 moar routing/auth refactorings 2012-10-19 22:20:45 +02:00
Sven Fuchs
c4b91108a0 refactor routes/auth interaction so that it always calls afterSignIn() 2012-10-19 21:24:18 +02:00
Sven Fuchs
a806dd7ff8 refactor broadcasts 2012-10-19 04:27:07 +02:00
Piotr Sarnacki
a29e3003cb Update ember 2012-10-19 01:52:16 +02:00
Sven Fuchs
45cc6a47e3 fix top menu active item styles 2012-10-19 00:33:39 +02:00
Piotr Sarnacki
82163346b9 We don't have to transitionTo('root') here 2012-10-18 03:38:45 +02:00
Piotr Sarnacki
cb76de3718 Move afterSignIn to auth Route
If we keep it only on states lower than root and afterSignIn is sent
when app is still in root.loading (which is often the case as we need to
wait for repository deserialization), it will try to find afterSignIn on
root.
2012-10-18 03:28:29 +02:00
Konstantin Haase
d4404b201c switch to puma, make app reload in development mode 2012-10-17 16:19:42 +02:00
Sven Fuchs
03595db5fa re-add guard, rename "profile" menu item to "accounts" and add the github badge to the accounts sidebar 2012-10-17 03:21:28 +02:00
Piotr Sarnacki
450f2b5f49 Make page nicer in smaller resolutions 2012-10-16 22:41:04 +02:00
Piotr Sarnacki
ce534fdcb8 Make layout work for smaller resolutions 2012-10-16 22:29:00 +02:00
Piotr Sarnacki
c9a578a012 Fix log scrolling issues on Firefox 2012-10-16 21:30:02 +02:00
Piotr Sarnacki
efcdae70c0 Fix layout in firefox 2012-10-16 21:17:42 +02:00
Piotr Sarnacki
0bb3eff03b Fix popup positioning and make sure popups always open properly
(closes #24)
2012-10-16 19:41:57 +02:00
Konstantin Haase
ab866b4fe2 no longer run api 2012-10-16 18:42:37 +02:00
Piotr Sarnacki
e278f007a7 Properly set token on user record (closes #25) 2012-10-16 18:35:18 +02:00
Piotr Sarnacki
9d07ef79ac Fix bug with undefined loadedAttributes 2012-10-16 17:47:03 +02:00
Piotr Sarnacki
96acd8e526 Fix specs and add missing spec file 2012-10-16 12:14:45 +02:00
Piotr Sarnacki
c05ce673bf Load incomplete records when trying to get unknown attribute
In order to minimize ajax requests, I implemented isComplete property,
which can be used to check if record is fetched from the API or if it
was just partially loaded (for example by pusher event). This is nice in
terms of requests reduction, but caries risk of showing incomplete data.

This commit fixes this situation by saving which attributes were
provided on "incomplete" load and triggering refresh when any unknown
attribute is tried to be fetched.

The implementation is really simple and will probably need refactoring,
but I would like to test it in the wild before putting much more time
into it.
2012-10-16 03:05:38 +02:00
Sven Fuchs
393ef62eae Merge branch 'master' of github.com:travis-ci/travis-web
Conflicts:
	public/scripts/app.js
	public/scripts/min/app.js
	public/styles/app.css
	public/version
2012-10-16 02:05:17 +02:00
Sven Fuchs
f91622e7e8 add an events tab 2012-10-16 02:00:24 +02:00
Piotr Sarnacki
4153c990be Fix specs 2012-10-15 23:20:33 +02:00
Piotr Sarnacki
9976b47c93 WIP 2012-10-15 19:35:10 +02:00
Piotr Sarnacki
f43ffafcc0 Compile spec files 2012-10-15 17:14:05 +02:00
Sven Fuchs
bee1a895ba css sync and hooks buttons 2012-10-14 15:07:30 +02:00
Sven Fuchs
95b7ea03d2 set the reposController to the repoController in connectOutlets 2012-10-13 22:03:10 +02:00
Sven Fuchs
0a7349480e remove the absolute binding to see if that gets rid of the warnings 2012-10-13 21:28:40 +02:00
Sven Fuchs
4f53995481 recompile 2012-10-13 21:22:57 +02:00
Sven Fuchs
ed94cb7329 Merge branch 'master' of github.com:travis-ci/travis-web
Conflicts:
	assets/scripts/lib/travis/model.coffee
	public/scripts/app.js
	public/scripts/min/app.js
	public/version
2012-10-13 21:22:42 +02:00
Sven Fuchs
e7a26524d4 move select() functionality to Travis.Model and reuse it for accounts 2012-10-13 21:20:11 +02:00
Piotr Sarnacki
c707135ccd First spike of 'isComplete' functionality
When we get payload from pusher, we usually don't send the entire
record. Initially such records where fetched from server right away to
get missing data. This was done becuase Ember can't tell if given data
is complete or not and just assumes that the record is loaded.

To not fire unneeded request, this code sets incomplete flag on records
loaded from pusher and loads the rest of the data only if needed.
2012-10-13 20:47:21 +02:00
Piotr Sarnacki
7ccbba2959 Don't redirect user if we're already in state that's not auth 2012-10-13 19:00:56 +02:00
Sven Fuchs
28346ce233 add an empty repos view 2012-10-13 17:31:12 +02:00
Sven Fuchs
d84b5dfd0a add autoSignIn to fix that after signOut it would always re-signin on pages that require auth 2012-10-13 15:52:27 +02:00
Sven Fuchs
44d81af450 make sure we go through the auth check after signout 2012-10-13 15:07:35 +02:00
Sven Fuchs
4689545547 camelize to afterSignIn and add afterSignOut 2012-10-13 15:02:23 +02:00
Sven Fuchs
2485a7bcb9 fix router after_signin behaviour 2012-10-13 14:51:12 +02:00
Sven Fuchs
dee3591147 some tweaks 2012-10-13 04:34:30 +02:00
Piotr Sarnacki
88abeb48c0 We still return repository_id in build's payload 2012-10-12 20:51:05 +02:00
Piotr Sarnacki
3ecbc8f139 Fix workers sorting, it should be done based on SortableMixin 2012-10-12 20:37:12 +02:00
Piotr Sarnacki
87bccccde8 Fix routing to build/job when object is already loaded 2012-10-12 18:46:27 +02:00
Piotr Sarnacki
2575218ddb Fix logs to always point to build or job view 2012-10-12 18:32:25 +02:00
Piotr Sarnacki
a3ec12bda7 Fix some of the build links 2012-10-12 15:34:07 +02:00
Piotr Sarnacki
a3826fbeb3 Show all repos accessible by current user in 'My repositories' 2012-10-12 14:42:04 +02:00
Sven Fuchs
d2cbde2cfa use the rake-pipeline project directly. cuts asset build time by 50% 2012-10-12 02:41:15 +02:00
Sven Fuchs
f16c83d10f somewhat more consistent naming 2012-10-12 02:34:54 +02:00
Sven Fuchs
ba685b1593 set cache headers, can't get rack/cache to behave though 2012-10-11 20:05:33 +02:00
Sven Fuchs
b35763baa3 using the production pusher key with RUN_API causes tons of 404 errors 2012-10-11 17:23:32 +02:00
Sven Fuchs
551b976bbc re-enable auto-auth 2012-10-11 15:34:01 +02:00
Sven Fuchs
05a57a593c deactivate auto-auth for now because redis has run full :/ 2012-10-11 05:16:07 +02:00
Piotr Sarnacki
6a487c8fd8 Actually fix profile view when reloading page - no need to redirect 2012-10-11 01:25:18 +02:00
Piotr Sarnacki
e561d7e145 Use localStorage instead of cookies 2012-10-10 22:42:28 +02:00
Piotr Sarnacki
3c303e5a86 Reload page when locale for user changes, also cache it in cookie 2012-10-10 22:37:44 +02:00
Piotr Sarnacki
a15836c50a Buffer search phrase to fire only after 500ms of last key press 2012-10-10 19:20:43 +02:00
Piotr Sarnacki
ed2ddc04f6 Fix back button
Repo.bySlug can return loaded items if they were loaded previously,
that's why it will not trigger isLoaded property change.
2012-10-10 19:07:32 +02:00
Piotr Sarnacki
b142d3cdcf Close popups and menus when clicking outside of them 2012-10-10 18:45:33 +02:00
Piotr Sarnacki
e997ac7f6a Make sure that workers are correctly sorted 2012-10-10 17:25:55 +02:00
Piotr Sarnacki
aef185f536 Show message on stats page 2012-10-10 16:47:22 +02:00
Piotr Sarnacki
404dde1cdf Initialize application in Ember.next, fixes auth 2012-10-10 16:13:21 +02:00
Sven Fuchs
24d98eb66a ok, it's DEFAULT_ENDPOINT 2012-10-10 14:16:47 +02:00
Sven Fuchs
00b38062cc stop loading the app config from the api cuz it adds quite a noticeable delay 2012-10-10 13:25:22 +02:00
Sven Fuchs
3052db733b parse pusher key into the index.html like the api endpoint 2012-10-10 13:21:52 +02:00
Sven Fuchs
7cd5899eba hm, also check for the build here, obviously 2012-10-10 12:29:31 +02:00
Sven Fuchs
056f20ddfe check if we do have jobs before trying to iterate over them 2012-10-10 12:04:31 +02:00
Piotr Sarnacki
9c5e709c0c Revert changes in css
For some reason css was recompiled without any changes in css files,
which caused menu items to break.
2012-10-09 19:34:35 +02:00
Piotr Sarnacki
7fc77e66ea Limit repos list to 30 items 2012-10-09 18:23:11 +02:00
Piotr Sarnacki
7f6210ec6c Fixed build links on worker's list 2012-10-09 16:41:13 +02:00
Sven Fuchs
67aacb7baa keep flash messages for 10sec 2012-10-09 16:15:18 +02:00
Sven Fuchs
927c8de8b0 remove flash count binding and solve that in css 2012-10-09 15:53:23 +02:00
Sven Fuchs
6342367810 remove debug flash message 2012-10-09 15:28:10 +02:00
Sven Fuchs
6e7382ed05 Merge branch 'master' of github.com:travis-ci/travis-web
Conflicts:
	Gemfile.lock
	public/scripts/app.js
	public/scripts/min/app.js
	public/styles/app.css
	public/version
2012-10-09 15:25:27 +02:00
Sven Fuchs
847c120bd7 fuck yeah, flash messages 2012-10-09 15:16:54 +02:00
Piotr Sarnacki
233e95b18d Use empty function instead of Ember.K
Technically it's the same thing, but since in coffeescript it's just a
few characters, there is no need to use something that does not
explicitly say what it does.
2012-10-09 13:18:24 +02:00
Piotr Sarnacki
64fc6ce717 Don't trigger state change on signin if already in authenticated state 2012-10-09 13:08:57 +02:00
Sven Fuchs
7e6907feba Merge branch 'master' of github.com:travis-ci/travis-web
Conflicts:
	Gemfile.lock
	public/scripts/app.js
	public/scripts/min/app.js
	public/version
2012-10-09 12:33:11 +02:00
Sven Fuchs
6cbe6f140e refactor ajax, get rid of the module 2012-10-09 12:31:15 +02:00
Piotr Sarnacki
e0d3d83484 Kill typo 💣 2012-10-09 12:06:37 +02:00
Piotr Sarnacki
3a999e8598 If there is no path, route to '/' 2012-10-09 04:11:23 +02:00
Piotr Sarnacki
e6106a236a Remove initialState properties from most of the routes
initialState in some of the routes where needed because router was
behaving incorrectly when going to 'default state'. Now it is fixed, so
initialState entries are not needed anymore in those places.
2012-10-09 03:56:26 +02:00
Piotr Sarnacki
504a58add8 Check if permissions exist before calling anything on them 2012-10-08 22:42:02 +02:00
Piotr Sarnacki
94e16ab229 Worker still gets payload with repository
I tweaked the code to work for both versions, so we can update API
flawlessly
2012-10-08 17:32:04 +02:00
Piotr Sarnacki
37d1348054 Use Travis Pro in sponsors info 2012-10-08 17:12:39 +02:00
Piotr Sarnacki
b309819f24 Display Travis CI as box sponsor if there is not worker with given name 2012-10-08 17:09:42 +02:00
Piotr Sarnacki
94f1e64554 Show sponsor info under the log 2012-10-08 16:53:31 +02:00
Sven Fuchs
521fc3112d add flash messages and styles 2012-10-08 16:27:55 +02:00
Sven Fuchs
41ab0c4cb0 set content on user permissions array proxy 2012-10-08 13:38:13 +02:00
Sven Fuchs
3580952076 try fixing the root key for Repo.find() (even though ember-data really seems weird here) 2012-10-07 17:58:06 +02:00
Sven Fuchs
a8f19aa687 try making workers item view more robust 2012-10-07 17:05:29 +02:00
Sven Fuchs
02a1f166d5 change tools button to have a menu, add requeue menu item, make status image stuff a popup 2012-10-07 16:59:01 +02:00
Sven Fuchs
25dffc0a7a load user permissions 2012-10-06 23:40:05 +02:00
Sven Fuchs
6e4413d5a2 finally rename repository to repo 2012-10-06 20:08:46 +02:00
Sven Fuchs
c6223341f4 rework the asset pipeline to use environments 2012-10-06 15:28:11 +02:00
Sven Fuchs
f6ac7b9c30 showUnauthenticated after signout 2012-10-06 15:27:49 +02:00
Sven Fuchs
b34e35fbb8 improvements to the asset pipeline thanks to @twinturbo 2012-10-05 21:58:20 +02:00
Sven Fuchs
38ea058afc fix assets order 2012-10-04 00:20:17 +02:00
Sven Fuchs
152dde6e05 make things even more generic 2012-10-03 19:29:44 +02:00
Sven Fuchs
d67e0b23bc make Assetfile more agnostic 2012-10-03 18:12:44 +02:00
Sven Fuchs
7b47863014 extract paths in Assetfile; rename javascripts to scripts, stylesheets to styles 2012-10-03 17:13:02 +02:00
Sven Fuchs
9440ccaf7d make assetfile reusable 2012-10-03 16:34:21 +02:00
Sven Fuchs
3d451279e4 add the favicon 2012-10-03 13:29:50 +02:00
Piotr Sarnacki
202f158d55 Fix show more button and make it disabled when loading 2012-10-02 22:39:11 +02:00
Piotr Sarnacki
2e16337e68 Revert 2ead1ff
Without filters those collections will not be updated when clicking on
show more button on builds list.
2012-10-02 21:46:34 +02:00
Sven Fuchs
54ea7e9246 Merge branch 'master' of github.com:travis-ci/travis-ember 2012-10-01 16:50:29 +02:00
Piotr Sarnacki
8b90440f7b Update ember to version from drogus/ember.js
It contains patch for transitionTo, to handle more than one context
2012-10-01 16:46:11 +02:00
Sven Fuchs
4402a36c2e generate a real version hash 2012-10-01 13:11:26 +02:00
Sven Fuchs
419ace7c51 rework asset compilation 2012-10-01 12:36:06 +02:00
Sven Fuchs
73fe04185d split up config.ru 2012-09-30 17:30:57 +02:00
Sven Fuchs
1566595cda move loadConfig to Travis.run 2012-09-29 23:43:06 +02:00
Piotr Sarnacki
b9179e3439 Need to add record to the new transaction after saving it 2012-09-28 19:09:05 +02:00
Piotr Sarnacki
82107bd1f3 Fix issues with store commit 2012-09-28 18:53:04 +02:00
Piotr Sarnacki
fed3adaa88 Fix job links on queues list
For some weird reason action was using the view as target by default,
set it explicitly to router.
2012-09-28 17:52:16 +02:00
Piotr Sarnacki
8ffd466e9f Proper fix for last build link
It seems that when you use id in link, it will pass it directly to
connectOutlets. Need to instantiate object in such situation.
2012-09-28 17:39:40 +02:00
Piotr Sarnacki
3cf12e7a84 Remove console.log 2012-09-28 17:26:38 +02:00
Piotr Sarnacki
4984a896af 'build_id' should be returned in build's params, not 'id' 2012-09-28 17:20:52 +02:00
Sven Fuchs
ab8473e75e really fix the status colors 2012-09-28 16:35:07 +02:00
Sven Fuchs
1332a23561 fix status color for build summary 2012-09-28 16:28:48 +02:00
Sven Fuchs
3bad25471a fix deansi for erasing text 2012-09-28 15:12:55 +02:00
Sven Fuchs
580d78e947 redirect from hashbang urls 2012-09-28 12:13:19 +02:00
Sven Fuchs
15d7406d71 redirect to home from profile on sign out 2012-09-28 12:05:56 +02:00
Sven Fuchs
a1d5b8b878 recompile 2012-09-28 11:48:29 +02:00
Sven Fuchs
8fb0411f63 make the spinner transparent 2012-09-28 11:46:31 +02:00
Sven Fuchs
5eb5bc1373 no need to defer loading the user any more 2012-09-28 11:28:00 +02:00
Sven Fuchs
b1f1547113 Revert "try using jobs.loaded for matrixes"
This reverts commit 312fabeaa0.
2012-09-28 10:57:05 +02:00
Sven Fuchs
312fabeaa0 try using jobs.loaded for matrixes 2012-09-28 10:54:38 +02:00
Piotr Sarnacki
5fc58e34dc Don't instantiate builds for repos list to not load them 2012-09-28 00:21:44 +02:00
Sven Fuchs
40260c17d5 separate session storage of user and token, do stuff 2012-09-27 23:38:33 +02:00
Sven Fuchs
abb5ed181e do not load accounts on controller init 2012-09-27 23:09:00 +02:00
Sven Fuchs
2f43801893 recompile 2012-09-27 21:56:30 +02:00
Piotr Sarnacki
c24b236120 Recompile, commited application.js with conflicts 2012-09-27 19:57:37 +02:00
Piotr Sarnacki
7037c6a62a Rework some of the bindAttrs that can cause problems 2012-09-27 19:53:46 +02:00
Sven Fuchs
fd6a83aab1 remove debug output 2012-09-27 17:30:30 +02:00
Sven Fuchs
205f509b4b recompile 2012-09-27 17:25:12 +02:00
Sven Fuchs
c80203afd3 Merge branch 'master' of github.com:travis-ci/travis-ember
Conflicts:
	public/javascripts/application.js
2012-09-27 17:22:11 +02:00
Sven Fuchs
d3e1fa2274 refactor auth/user/accounts 2012-09-27 17:13:45 +02:00
Piotr Sarnacki
11b3a039d2 Removed too much bindings, this one is still needed 2012-09-27 15:18:08 +02:00
Piotr Sarnacki
cd6636bfc5 Completely get rid of params
In the old router params were fetched from url, new router needs to
instantiate objects anyway, so we can just set objects on controller
instead of passing params.
2012-09-27 14:48:17 +02:00
Piotr Sarnacki
57ae258803 Update ember 2012-09-27 14:47:48 +02:00
Piotr Sarnacki
3aefc86961 Make displaying build simpler
Since we fetch build in router now, we can just pass it to controller,
instead of passing an id.
2012-09-27 14:47:48 +02:00
Sven Fuchs
b776f1355b recompile 2012-09-27 00:58:10 +02:00
Piotr Sarnacki
164b8d22cc Don't load sponsors data twice 2012-09-27 00:21:35 +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
Piotr Sarnacki
b31515fa57 Update ember and ember-data 2012-09-26 15:07:52 +02:00
Sven Fuchs
af02f2b2f3 fix hooks, sync and try fixing locale 2012-09-26 12:34:40 +02:00
Sven Fuchs
fa45c37bba recompile 2012-09-25 19:26:07 +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
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
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
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
f0e9247b51 do not show the signing in status on auto-sign-in for now 2012-09-22 21:17:08 +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
c8f43f5d13 remove the auth controller and view 2012-09-22 13:23:22 +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
0689e69500 bundle update and recompile 2012-09-20 17:10:05 +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
Konstantin Haase
d2aef0d12f change text before initiating handshake 2012-09-19 16:33:43 +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
Konstantin Haase
f9036e0a26 add # route 2012-09-19 14:53:22 +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