Simo Kinnunen 60bdecc5d4 Merge branch 'feature/screenshot' into develop ...

Conflicts:
	res/app/control-panes/dashboard/upload/upload.jade

2014-05-22 13:38:44 +09:00

..

apps

-Added battery info to the device list.

2014-05-01 22:06:48 +09:00

browser

- Moved browser selection to Navigation.

2014-04-22 21:11:46 +09:00

clipboard

Logging to the console.

2014-05-12 19:28:56 +09:00

input

Adding clipboard paste.

2014-05-12 19:02:17 +09:00

navigation

UI fixes in upload and device control.

2014-05-21 18:07:28 +09:00

shell

All transaction-based ControlService methods now return promises directly, which makes it easier to integrate with other promises, is simpler and opens up new refactoring opportunities.

2014-04-15 16:56:13 +09:00

upload

Merge branch 'feature/screenshot' into develop

2014-05-22 13:38:44 +09:00

dashboard-controller.js

- Bringing back browser, navigation, input, dashboard and shell templates.

2014-03-27 21:30:27 +09:00

dashboard-spec.js

- Bringing back browser, navigation, input, dashboard and shell templates.

2014-03-27 21:30:27 +09:00

dashboard.jade

Adding clipboard paste.

2014-05-12 19:02:17 +09:00

index.js

Adding clipboard paste.

2014-05-12 19:02:17 +09:00