Commit Graph

5562 Commits (139b4608c08ed36505050fe87aa66db0613b20d3)

Author SHA1 Message Date
yflory 56c30fc02e lint compliance 2018-09-10 15:33:24 +02:00
yflory 8f6d0b1c3a Merge branch 'staging' into chat 2018-09-10 15:32:39 +02:00
yflory 9eb4e2e0dc Reorder the chat rooms in the list based on the time of the last message 2018-09-10 15:32:07 +02:00
yflory cdce69e677 Improve messenger UI in apps 2018-09-10 13:20:01 +02:00
yflory d4dd58e7df Add a pad room when the messenger is active in a pad 2018-09-07 19:35:06 +02:00
b3yond 45097dfe69
German strings for automatic pad storage settings 2018-09-07 00:58:33 +02:00
b3yond d49cccd740
Changed strings for automatic pad storage settings 2018-09-07 00:37:56 +02:00
yflory 9e27f111cb lint compliance 2018-09-06 18:45:53 +02:00
yflory e6743887fc Refactor contacts/messenger so that it is usable directly in the apps 2018-09-06 18:41:22 +02:00
ansuz e83b225295 update changelogs 2018-09-04 10:28:01 -04:00
ansuz 8dec54d550 WIP Changelog 2018-09-04 09:38:26 -04:00
yflory ac85b3e238 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-09-04 15:28:34 +02:00
yflory 4a2fa77bb7 French translation 2018-09-04 15:28:20 +02:00
ansuz 0e70961074 password-protected shared folders aren't urgent. dropping the XXX 2018-09-04 09:14:13 -04:00
ansuz a203a67a53 update another translation 2018-09-04 09:06:32 -04:00
ansuz 2b2995d2c0 update a few english translations 2018-09-04 09:00:32 -04:00
ansuz 2bd02ca69e bump version to 2.7.0 2018-09-04 08:59:38 -04:00
yflory 5b6aa4ba0a Reorder autostore options in Settings 2018-09-04 14:49:22 +02:00
yflory 2f3576f90e Fix image preview not resized correctly in the mediatag dialog 2018-09-04 10:50:34 +02:00
yflory ab07554d0b Fix initial size of the image preview in the mediatag dialog 2018-09-04 10:45:18 +02:00
yflory 525703e7d8 Fix autostore popup displayed for dropped files 2018-09-04 10:36:19 +02:00
yflory 855612e98b Make oo work with hashes v2 2018-09-03 11:20:32 +02:00
yflory bf9cf95292 Merge branch 'staging' into oo2 2018-09-03 10:49:12 +02:00
yflory ee1027ceb9 Ability to import mediatags to the drive 2018-08-31 15:41:08 +02:00
yflory 2bb7e68792 Remember previous values in the file upload modal 2018-08-30 12:14:37 +02:00
yflory 475301477f Progress bar for loading a pad (framework only) 2018-08-30 12:07:21 +02:00
yflory 264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored 2018-08-30 11:21:33 +02:00
yflory 7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory 90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app 2018-08-29 18:20:34 +02:00
yflory b1f2d287b4 Add warning for chrome 68 users on Mac 2018-08-28 17:44:15 +02:00
Marcel 886451393e
Merge branch 'master' into fix-#254 2018-08-28 17:11:20 +02:00
yflory 256b7b5bb4 Phantom viewers potential fix 2018-08-28 16:28:32 +02:00
yflory 0e1c525c30 Fix an issue with new shared folder added to drive from another session 2018-08-28 14:29:13 +02:00
yflory d201e9a0cd Disable some toolbar features not available if the pad is not stored 2018-08-28 12:12:47 +02:00
yflory 9ebb598467 Make automatic pad storage configurable 2018-08-28 11:42:48 +02:00
yflory 62817d09cb Merge branch 'master' into staging 2018-08-27 15:10:00 +02:00
yflory e8a5244362 Autostore base 2018-08-27 14:58:09 +02:00
yflory 294fa38137 Add blockbase64 plugin to ckeditor 2018-08-27 14:57:38 +02:00
yflory 5cd3cdc208 Don't handle drop events in the blockbase64 plugin 2018-08-27 14:57:16 +02:00
yflory 3f89dd9908 Disable pasting base64 images in ckeditor 2018-08-27 11:59:18 +02:00
yflory aa2a01174f lint compliance 2018-08-23 12:37:47 +02:00
yflory a117e329dc Add a Share entry in the drive's context menu 2018-08-23 12:34:44 +02:00
yflory e0b7f3f965 When importing a shared folder to the drive, open this folder directly 2018-08-23 11:55:14 +02:00
yflory 630a2dab78 Fix context menu issues with shared folders in the tree 2018-08-23 11:09:28 +02:00
yflory fddff11fae Rename shared drive to shared folder 2018-08-22 17:01:44 +02:00
yflory 61659c1252 Fix template icon not overriden by a thumbnail in the PCS 2018-08-22 16:32:44 +02:00
yflory ce08d7b650 Merge branch 'master' into soon 2018-08-22 15:34:06 +02:00
ansuz 9fe78dcc5f bump version from 2.5.0 to 2.6.0 2018-08-22 15:32:47 +02:00
yflory b084b892bd Fix cache issues with workers in firefox 2018-08-22 15:26:42 +02:00
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 2018-08-16 16:59:52 +02:00