Commit Graph

4772 Commits (6f1c2d57016673e490d1612c22d2d41e23ae3ff4)
 

Author SHA1 Message Date
ansuz ed253e6c75 Merge branch 'staging' into evilham
ansuz df1a700cb2 disable thumbnail test. add test for flat dom
ansuz 02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 69890ebd8f prototype alternate datastructure for trees in listmap
ansuz 23c305f71f implement removeItem so localForage doesn't complain
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming
yflory 8251247da2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 6f020b67ca Add thumbnails to framework apps
yflory 26c4bda4cd Fix file upload in code and slide
ansuz 98c66ef8f6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory bf817f20ee Fix file upload in code and slide
ansuz f031af4e9d fix broken media-tags in contacts
ansuz f52a46c5aa add html2canvas dependency
yflory 24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory f4adbd980e Thumbnails for the code app
ansuz ba97aa7ad2 allow file upload handler to create thumbnails for whiteboard
ansuz 6157c57a4b disable color palette when interface is not editable
ansuz 8359902f6a fix typo in poll
ansuz 69f9a7ebf3 make userlist change notifications configurable
Caleb James DeLisle 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
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