Commit Graph

4903 Commits (7800fa2dcd733e9ba2ef57fdb8081d2a0696d07e)
 

Author SHA1 Message Date
Caleb James DeLisle aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
ansuz bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz dc90811090 only call onReady once in sframe-listmap
yflory bac10472f3 lint compliance
yflory 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 18b5b20d27 Add thumbnails for PDFs
ansuz aee51f1317 lint compliance
ansuz 447b0a74ee handle errors for videos when uploading
yflory 30a69fae13 Add thumbnails for videos
yflory 21f8ae7570 Keep the correct ratio for image thumbnails
yflory 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll
yflory 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory a0bcb901d3 Add titles in poll when options or usernames are overflowing
yflory 74985fd0f2 Use text for the addUser button in polls
ansuz 7d1892546b add missing french translation
ansuz 6db5a34323 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz c17fc2efe7 improve option order in poll
yflory 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 13718d0263 Fix recent pads in chrome
ansuz 2e5fdf709a Merge branch 'soon' into staging
ansuz de8339fea7 hide alertify when you are in presentation mode
ansuz aaef30f489 bump cryptpad version
Caleb James DeLisle 9b02b36724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle d7e9498143 Fix and then disable the new OT
ansuz 05c66e64dd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 288e141c1f add missing sframe method
yflory ce5d24a1d3 Remove error message about Tether
ansuz d571f408d8 Merge pull request from MacLemon/reduce-image-asset-size
Compressed images for faster connections
ansuz 8590cf3f75 Merge pull request from yannicka/patch-1
Update French translation
yflory c1d05a00ba Improve media-tag export in pad to work with existing CSP
yflory 3e4faf1be1 Add new state messages in the toolbar
yflory 6d080bcb45 Ability to export mediatag images in pad
yflory a0dd867f33 Fix pending state not removed after friend invite rejected
yflory c25be21138 Fix the upgrade button in the drive
Caleb James DeLisle cc6b2192e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Yannick A 63dcfd6d18 Update French translation
yflory a3c7aa67d8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 094856a511 Fix renaming pad with multiple dots in the name in drive
ansuz bf832ba784 fix comment overflow
yflory 7bc2f81852 Fix pinned column not always stored in polls
yflory 88e7f9a218 Add last access and creation times in the properties window in drive
yflory 22e3baed4b Fix sort issues in drive
yflory f43606f71d Present mode to display only the parsed markdown in code
yflory 515214aed1 Use present mode in embed code
yflory 201c974df6 Merge branch 'thumbnails' into staging
yflory 7b8490ad20 Use less2 in contacts
yflory dd63cd13d7 Fix profile page title
Caleb James DeLisle 81d0b3272d Fix multiple infinite-spinner errors piling up on top of eachother
Caleb James DeLisle 9e4c48f537 lint errors
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework