Commit Graph

8976 Commits (5282def75bb16d7c073bbd47b5920185f494ffad)

Author SHA1 Message Date
ansuz bd3e18d1a8 only cache a user's pinned channels if there are no errors when loading them 2020-04-08 12:08:26 -04:00
yflory cba8f5fce6 Merge branch 'staging' into stoppegp-code-authorcolors-PR 2020-04-08 17:03:30 +02:00
yflory ee3adccafc Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR 2020-04-08 17:03:09 +02:00
ansuz bef18a9320 hotfix 2020-04-08 10:28:26 -04:00
yflory 7acbe4ba2c Comment plugin 2020-04-08 16:16:57 +02:00
ansuz 7fac997e93 increase some file storage timeouts related to streams 2020-04-08 09:38:48 -04:00
ansuz 95965c1dee keep a parallel implementation of the pin loader to validate the new one 2020-04-07 20:03:41 -04:00
stoppegp 272c1007db authorcolor storage optimizations 2020-04-07 20:49:36 +02:00
stoppegp 56031a5c14 authorcolor storage optimization, add undefined checks before access, code styling 2020-04-07 20:30:55 +02:00
stoppegp 79325b8cca bugfix authorcolors: wrong end position on multiline edit 2020-04-07 19:07:12 +02:00
stoppegp 5f7bc9fca5 fix remove author color button when nothing is selected 2020-04-07 17:14:57 +02:00
yflory 1551a1b969 lint compliance 2020-04-07 17:14:06 +02:00
yflory 0ccc57f6f7 Protect current pad keys in the unsafe iframe 2020-04-07 17:12:06 +02:00
yflory 43904df0fb Display properties modal in the secure iframe 2020-04-07 17:04:39 +02:00
stoppegp 8696ecc692 add 'remove authorcolors' button 2020-04-07 16:52:38 +02:00
stoppegp 45b5eb7cac add basic author colors to code app 2020-04-07 16:08:28 +02:00
ansuz dca2707ae3 guard against incorrect types in /auth/ 2020-04-07 09:45:21 -04:00
yflory ca8c50ca37 Merge branch 'staging' into secureiframe 2020-04-07 15:41:49 +02:00
yflory e5bcaeedce Fix regression in the access modal 2020-04-07 15:38:16 +02:00
yflory 4f838777ab Merge branch 'q' into secureiframe 2020-04-07 15:24:17 +02:00
yflory 2aec7c2569 Open the access modal in the secure iframe 2020-04-07 15:24:12 +02:00
yflory 6103588faa Fix access modal bug introduced with the latest commit 2020-04-07 15:22:40 +02:00
yflory 19a0dafbe1 Merge branch 'q' into secureiframe 2020-04-07 14:54:48 +02:00
yflory 62187d855f lint compliance 2020-04-07 14:29:58 +02:00
yflory fc2cd19821 lint compliance 2020-04-07 14:29:31 +02:00
yflory 894a355f0a Merge filepicker and share iframes 2020-04-07 14:27:44 +02:00
yflory 4672bf794b Make sure we don't try to get metadata for blobs 2020-04-07 11:03:35 +02:00
yflory 9de345044a Prompt anonymous users to login if they should create a checkpoint in oo 2020-04-07 10:47:57 +02:00
ansuz e1069b0abb 3.15.0 changelog 2020-04-06 20:02:33 -04:00
ansuz 2e290a6667 last minute fixes and notes 2020-04-06 18:21:07 -04:00
ansuz a57bf94058 remove XXX note 2020-04-06 11:31:31 -04:00
ansuz 9ef755c07b update minor version and codename 2020-04-06 11:26:34 -04:00
yflory a834d653aa Fix download button size in mediatag preview 2020-04-06 16:48:42 +02:00
David Benqué bee2a44c5a Merge remote-tracking branch 'origin/staging' into staging 2020-04-06 15:43:21 +01:00
David Benqué f95c385c82 filepicker button 2020-04-06 15:42:26 +01:00
David Benqué e1be241406 filepicker thumbnail style 2020-04-06 15:42:14 +01:00
ansuz 7434c344f5 Merge branch 'soon' into staging 2020-04-06 10:29:19 -04:00
ansuz 7027033ed1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:29:01 -04:00
ansuz c53675c9d5 WIP worker rpc call queue 2020-04-06 10:28:26 -04:00
Weblate 3f126f1bec Translated using Weblate (German)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-06 16:27:15 +02:00
Weblate 6ea958c7bd Translated using Weblate (Finnish)
Currently translated at 72.2% (899 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
2020-04-06 16:27:15 +02:00
yflory f5de72dcb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 16:27:12 +02:00
yflory 15d86c9bd1 Merge branch 'pcs' into staging 2020-04-06 16:26:38 +02:00
yflory 8370f3121c Remove XXX 2020-04-06 16:26:29 +02:00
ansuz d802173325 remove an invalid line 2020-04-06 10:18:11 -04:00
ansuz 90518224fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:16:12 -04:00
ansuz 5196440e65 guard against a typeError when httpSafeOrigin is not defined 2020-04-06 10:16:02 -04:00
yflory 3aefc3a893 Fix icon size in the new pad modal 2020-04-06 16:13:51 +02:00
yflory 0f21f3118b Fix lightbox errors 2020-04-06 16:00:01 +02:00
yflory c29b7d3389 Fix reference error 2020-04-06 15:52:13 +02:00