Commit graph

47 commits

Author SHA1 Message Date
ansuz
d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
yflory
47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory
a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory
456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
Caleb James DeLisle
b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +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
yflory
ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
yflory
8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory
437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle
981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 2017-09-12 14:12:35 +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
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
0423a5f4e2 Clean secure iframe code 2017-09-06 18:26:10 +02:00
yflory
04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory
3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory
d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory
86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +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
Caleb James DeLisle
0a6f81850f Handle infinite-spinner errors and properly inform the user 2017-08-25 14:24:43 +02:00
Caleb James DeLisle
acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
yflory
c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
yflory
aa9e0d3cd3 Enable AppConfig in pad2 2017-08-21 18:30:51 +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
b2e6df1f9d Add import & export in pad2 2017-08-21 15:34: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
e65b2f4e9f Add shareButton to pad2 2017-08-18 18:43:04 +02:00
yflory
90f892de9c Useradmin menu, notifications and share button in pad2 2017-08-18 16:34:41 +02:00
yflory
dd9b38066e Change display name in useradmin menu 2017-08-18 11:07:42 +02:00
Caleb James DeLisle
cf6d8c83b2 Fix title setter logic and separate it from UI 2017-08-17 19:58:48 +02:00
Caleb James DeLisle
415399ef64 Changes to support title change in metadata 2017-08-17 19:01:33 +02:00
yflory
604415b32c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 18:29:24 +02:00
yflory
fab3d67b75 Enable title in pad2 2017-08-17 18:28:05 +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
3b5af3ea74 sframe common changes 2017-08-17 16:56:18 +02:00
yflory
d1157c4d72 Add missing file 2017-08-17 16:28:54 +02:00