Commit Graph

16 Commits (9d229b886888fcee85074108e9dd17d5f08d531e)

Author SHA1 Message Date
Caleb James DeLisle 041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory 514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory 290d668ceb Fix race condition preventing slide to work on Edge 2017-09-08 15:53:53 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
yflory d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
yflory b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory 0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00