Commit graph

1269 commits

Author SHA1 Message Date
yflory
61b228db79 Fix double / when storing a file 2017-09-06 11:41:09 +02:00
yflory
3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory
0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 18:40:18 +02:00
yflory
e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
ansuz
b3d5e04bb4 lint compliance 2017-09-05 17:23:16 +02:00
ansuz
3d2a2da74e add listAllTags api 2017-09-05 16:52:22 +02:00
ansuz
0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:37:02 +02:00
ansuz
1c50bb3f61 clear hung tooltips 2017-09-05 15:36:46 +02:00
yflory
53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
yflory
729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
yflory
4108520d20 Add contacts in the new menu if the user is logged in 2017-09-05 11:43:16 +02:00
yflory
78b338c379 Merge branch 'code2' into staging 2017-09-05 11:38:17 +02:00
yflory
db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:36:31 +02:00
yflory
d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
ansuz
4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:27:11 +02:00
ansuz
cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz
b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
2017-09-05 10:57:59 +02:00
ansuz
b8e913c95a more thumbnail methods 2017-09-05 10:46:00 +02:00
ansuz
ffbb21dd2c use cryptpad-september build of media-tag 2017-09-05 10:43:48 +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
ansuz
1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-31 18:12:21 +02:00
ansuz
ae60b5845f implement search-by-tag for filesData 2017-08-31 18:12:13 +02:00
ansuz
72ef730f23 implement tag-related functions 2017-08-31 18:06:26 +02:00
ansuz
0302c06d0e send feedback if client does not support symbols 2017-08-31 18:04:20 +02:00
ansuz
52019dc763 make get and set pad attribute return only cloned data 2017-08-31 18:02:44 +02:00
yflory
89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
Caleb James DeLisle
e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server 2017-08-31 16:28:48 +02:00
yflory
885282ddea Fix undefined friend 2017-08-31 15:49:20 +02:00
Caleb James DeLisle
a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing 2017-08-30 19:23:01 +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
f54dc7505c Migrate indentation settings to a settings subobject 2017-08-30 17:19:50 +02:00
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory
f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 12:26:23 +02:00
yflory
0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
ansuz
ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz
be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
ansuz
a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz
181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory
51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
yflory
642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:03:05 +02:00
yflory
901917983b Fix an issue preventing pads to be stored in the drive 2017-08-29 11:02:56 +02:00
ansuz
8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz
24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz
7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz
430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
yflory
d9a4a32bf9 Fix avatar for anonymous users in secure pads 2017-08-28 16:57:10 +02:00
yflory
00fda0d7d7 Fix avatar in read-only mode (secure pads) 2017-08-28 16:49:28 +02:00