Commit Graph

13 Commits

Author SHA1 Message Date
Piotr Sarnacki
a5978dd36f Merge branch 'master' into dashboard
Conflicts:
	assets/scripts/app/controllers.coffee
	assets/scripts/app/routes.coffee
2015-01-19 13:09:30 +01:00
Lisa Passing
bf4bb17996 make dashboard more dynamic 2015-01-16 16:57:56 +01:00
Piotr Sarnacki
0dcf283aa0 Fix requests route name 2015-01-15 17:22:10 +01:00
Piotr Sarnacki
681622b58c Clean up controllers a bit 2015-01-15 17:08:40 +01:00
Piotr Sarnacki
19c3b6f455 Fix topbar on first sync page 2015-01-15 17:08:39 +01:00
Piotr Sarnacki
83bbb1d87f Move logic from FirstSyncView to the route 2015-01-15 17:08:39 +01:00
Piotr Sarnacki
33cf63ed83 Simplify rendering getting_started 2015-01-15 17:08:39 +01:00
Piotr Sarnacki
03ef70c82a Deactivate dashboard stylesheet by default 2015-01-15 12:57:57 +01:00
Piotr Sarnacki
fc0c549556 Create separate stylesheets for dashboard and the rest 2015-01-15 11:14:20 +01:00
Piotr Sarnacki
5065bb5739 Subscribe to pusher channels only when entering the MainRoute
We don't want to subscribe if we're at any other routes, because there is no
data there. The main target is to avoid all of the notifications from a common
channel if we're on the /dashboard route.
2015-01-15 10:36:35 +01:00
Piotr Sarnacki
a891892bd8 Add missing requires in routes 2015-01-14 18:23:51 +01:00
Piotr Sarnacki
1ab14e9188 Extract routes to individual files 2015-01-14 18:07:27 +01:00
Piotr Sarnacki
8715087237 Extract ApplicationRoute to a separate file 2015-01-14 14:07:05 +01:00