Commit graph

34 commits

Author SHA1 Message Date
ansuz
351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
ansuz
94c392b79f secure messaging 2017-10-02 18:57:17 +02:00
yflory
47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory
456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
yflory
8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
Caleb James DeLisle
8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
Caleb James DeLisle
8d3ebdbaf7 I'm stupid 2017-09-11 15:53:27 +02:00
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
05793c220c Fix secure iframes on Edge 2017-09-08 15:55:01 +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
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
51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
yflory
88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory
f40d2c0b20 Add templates to pad2 2017-08-21 18:21:53 +02:00
yflory
8d837d22ea Add history to pad2 2017-08-21 17:40:21 +02:00
yflory
e2d39de143 Forget button in pad2 2017-08-21 15:20:38 +02:00
yflory
140c6f3776 Add limit warning in pad2 2017-08-21 12:24:33 +02:00
yflory
30aef71603 Enable avatars in pad2 2017-08-21 12:01:38 +02:00
yflory
90f892de9c Useradmin menu, notifications and share button in pad2 2017-08-18 16:34:41 +02:00
Caleb James DeLisle
2490ee253f Added setDisplayName RPC 2017-08-17 18:09:17 +02:00
Caleb James DeLisle
0b34ceb0eb Added RPC setPadTitleInDrive() 2017-08-17 17:34:08 +02:00
Caleb James DeLisle
1e56fa31c0 yay, they talk and they don't fight 2017-08-10 18:31:44 +02:00
Caleb James DeLisle
c304071492 wip 2017-08-09 17:37:55 +02:00
Caleb James DeLisle
4b25ab80d6 wip 2017-08-09 14:45:39 +02:00
Caleb James DeLisle
35a55a15ed wip 2017-08-07 17:23:28 +02:00