Commit Graph

4760 Commits (34f2d66b7e31aa8d466ccadd6c9f5e48ba0b3fad)
 

Author SHA1 Message Date
yflory 31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 305feebbbe Fix scroll position when refreshing the drive tree
ansuz 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 1c50bb3f61 clear hung tooltips
yflory d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 53eb9bb541 Remove the logo from the filepicker loading screen
ansuz 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 77bbb3add4 bump footer and package.json version string
yflory 01881ac469 Update loading tips in the french translation
yflory 729c013af7 Get mediatag embed code from the file app
ansuz c790442736 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 5eb13461c0 remove anchor button
yflory 904936209a Remove loading tips in the file picker
yflory 98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 204e45dfae Enable templates in pad
yflory 4108520d20 Add contacts in the new menu if the user is logged in
ansuz 38e1ed93e4 Merge branch 'code2' into staging
ansuz acaf45a0e0 drop thumbnails if metadata is too large
yflory 78b338c379 Merge branch 'code2' into staging
yflory db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
yflory d2787e3eff Make code2 the default code app
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
ansuz d42d988d36 make test more resilient
ansuz cd7b00d45b make pixels 100px
ansuz e8ac5ed87f add a test for thumbnails
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
ansuz b8e913c95a more thumbnail methods
ansuz ffbb21dd2c use cryptpad-september build of media-tag
ansuz 2aa6458039 Merge pull request from xshadow/xshadow-cryptpad-readme-ansible
Updated Readme.md with hint for ansible setup
xshadow 05b11415c4 Updated Readme.md with hint for ansible setup
yflory c0f14dea5e Store code2 and set the title at the first visit
yflory 86e23ac19f Use less2 in secure iframes
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app
ansuz a10bab893f jshintignore media-tag
Caleb James DeLisle a164115e8c Add media-tag-nacl to cryptpad so it will be hosted on the server
ansuz 7b27b8635d fix padding on registration button
ansuz 6bb29e52e2 lint compliance
ansuz 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz ae60b5845f implement search-by-tag for filesData
ansuz 72ef730f23 implement tag-related functions
ansuz 0302c06d0e send feedback if client does not support symbols
ansuz 52019dc763 make get and set pad attribute return only cloned data
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker
Caleb James DeLisle e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server
yflory 885282ddea Fix undefined friend
CatalinScr 0ceb4cbbcb Updated the contact page with the new design
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
CatalinScr 1bf77cb77e changed the icons
CatalinScr ee325c1813 Repaired the errors from lint
CatalinScr f95f3f4f24 Updated the contact page