starred/stf-DeviceFarmer
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-19 08:33:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/screenshot' into develop

Browse Source 
Conflicts:
	res/app/control-panes/dashboard/upload/upload.jade
This commit is contained in:
Simo Kinnunen
2014-05-22 13:38:44 +09:00
parent 9ebb005654 41ed33f5c4
commit 60bdecc5d4
28 changed files with 813 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/app/control-panes/dashboard/upload/upload.jade
View File

@@ -3,9 +3,9 @@
i.fa.fa-upload
span(translate) Upload
clear-button(ng-click='clear()', ng-disabled='!installation && !upload').btn-xs
//label.checkbox-inline.pull-right
input(type='checkbox', ng-model='launchEnabled', ng-disabled='true')
span(translate) Launch
label.checkbox-inline.pull-right
input(type='checkbox', ng-model='launchEnabled')
span Launch
label.checkbox-inline.pull-right
input(type='checkbox', ng-model='installEnabled')
span(translate) Install
@@ -65,8 +65,6 @@
span(translate) Uploading...
strong(ng-switch-when='processing')
span(translate) Processing...
strong(ng-switch-when='storing')
span(translate) Storing...
strong(ng-switch-when='fail')
span(translate) Upload failed
strong(ng-switch-when='success')