dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,799 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

3799 Commits

Author SHA1 Message Date
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
ansuz 2aa6458039 Merge pull request #177 from xshadow/xshadow-cryptpad-readme-ansible 
Updated Readme.md with hint for ansible setup
 2017-09-05 10:11:34 +02:00
xshadow 05b11415c4 Updated Readme.md with hint for ansible setup 2017-09-04 22:00:11 +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 a10bab893f jshintignore media-tag 2017-09-01 10:18:42 +02:00
Caleb James DeLisle a164115e8c Add media-tag-nacl to cryptpad so it will be hosted on the server 2017-09-01 10:10:34 +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
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
CatalinScr 0ceb4cbbcb Updated the contact page with the new design 2017-08-31 16:26:20 +03:00
CatalinScr 83be769bb3 Merge branch 'master' into staging 
updated with new version
 2017-08-31 11:36:39 +03:00
CatalinScr 1bf77cb77e changed the icons 2017-08-31 11:27:02 +03:00
CatalinScr ee325c1813 Repaired the errors from lint 2017-08-31 10:20:10 +03:00
CatalinScr f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03: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 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +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 4db4f66786 Remove an unnecessary fix for Safari 2017-08-30 11:14:58 +02:00