Piotr Sarnacki 8d19410264 Merge remote-tracking branch 'origin/settings-pane' ... Conflicts: assets/scripts/app/controllers.coffee assets/scripts/app/routes.coffee assets/scripts/app/views/repo/show.coffee		2014-02-12 11:52:01 +01:00
..
controllers	Merge pull request #190 from travis-ci/hh-annotations	2014-01-27 08:41:52 -08:00
helpers	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
models	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
store	Initial annotation support	2013-07-10 17:49:47 -07:00
templates	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
views	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
app.coffee	Add mappings for sideloading annotations	2014-01-28 15:33:22 +01:00
auth.coffee	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
components.coffee	Use switches on settings pane	2014-01-21 18:46:36 +01:00
controllers.coffee	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
helpers.coffee	Remove the rest of the locales related stuff	2014-01-15 14:40:56 +01:00
models.coffee	Initial annotation support	2013-07-10 17:49:47 -07:00
pusher.coffee	Merge branch 'master' into hh-annotations	2014-01-24 10:18:58 -05:00
routes.coffee	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00
slider.coffee	Make the app work with disabled cookies	2012-12-10 17:37:09 +01:00
tailing.coffee	Revert tailing changes	2014-01-20 15:00:34 +01:00
views.coffee	Merge remote-tracking branch 'origin/settings-pane'	2014-02-12 11:52:01 +01:00