Commit graph

3669 commits

Author SHA1 Message Date
yflory
fe8b2c2556 Fix french translation 2017-09-06 15:43:30 +02:00
yflory
61b228db79 Fix double / when storing a file 2017-09-06 11:41:09 +02:00
yflory
8b2733e2da Fix typo 2017-09-06 11:37:19 +02:00
yflory
1be12a7f15 Merge branch 'soon' into staging 2017-09-06 11:21:59 +02:00
yflory
8f2776657b Add translations for pad embed 2017-09-06 11:21:53 +02:00
yflory
d98bbf7df9 Fix the pad app when cryptpad is in an iframe 2017-09-06 11:03:20 +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
47ec959032 make sure contenteditable is not set in read only mode 2017-09-05 18:35:11 +02:00
ansuz
6a735b441f use paul's print styles 2017-09-05 18:16:06 +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
yflory
31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:40:02 +02:00
yflory
305feebbbe Fix scroll position when refreshing the drive tree 2017-09-05 15:39:49 +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
d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:34:49 +02:00
yflory
53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
ansuz
5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:32:31 +02:00
ansuz
77bbb3add4 bump footer and package.json version string 2017-09-05 15:29:28 +02:00
yflory
01881ac469 Update loading tips in the french translation 2017-09-05 15:15:57 +02:00
yflory
729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
ansuz
c790442736 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 12:18:16 +02:00
ansuz
5eb13461c0 remove anchor button 2017-09-05 12:16:49 +02:00
yflory
904936209a Remove loading tips in the file picker 2017-09-05 11:59:42 +02:00
yflory
98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 11:57:54 +02:00
yflory
204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory
4108520d20 Add contacts in the new menu if the user is logged in 2017-09-05 11:43:16 +02:00
ansuz
38e1ed93e4 Merge branch 'code2' into staging 2017-09-05 11:42:00 +02:00
ansuz
acaf45a0e0 drop thumbnails if metadata is too large 2017-09-05 11:38:49 +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
d42d988d36 make test more resilient 2017-09-05 11:26:41 +02:00
ansuz
cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz
e8ac5ed87f add a test for thumbnails 2017-09-05 11:24:30 +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
c0f14dea5e Store code2 and set the title at the first visit 2017-09-04 17:09:45 +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
7b27b8635d fix padding on registration button 2017-08-31 18:58:08 +02:00
ansuz
6bb29e52e2 lint compliance 2017-08-31 18:45:18 +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