Commit Graph

8613 Commits (dc0460780fc146c4d8fed17c88b5bc05ed7dc0ae)

Author SHA1 Message Date
ansuz dc0460780f Merge branch 'soon' into staging 2020-04-15 09:44:30 -04:00
ansuz c46561e98d Merge branch 'master' into soon 2020-04-15 09:44:23 -04:00
ansuz 22186ccb62 Merge branch 'mermaid-styles2' into staging 2020-04-15 09:43:53 -04:00
ansuz 74567e0cf4 return process memory usage in GET CACHE STATS RPC 2020-04-14 15:53:58 -04:00
ansuz 713fa9ef9a
Merge pull request #525 from ma-neumann/master
Allow config.defaultStorageLimit to be zero bytes
2020-04-14 15:47:44 -04:00
ansuz 9a7681dc5d add a note about handling syntax errors in mermaid 2020-04-14 15:18:20 -04:00
ansuz ca2dc85b34 reduce eye-bleed with gentler styles for mermaid charts 2020-04-14 15:17:41 -04:00
yflory 5fe7f55f51 Fix share with a team when we don't have contacts yet 2020-04-14 10:47:53 +02:00
Martin Alexander Neumann e3f42cbc20 Allow config.defaultStorageLimit to be zero bytes 2020-04-11 20:46:09 +02:00
ansuz 44a3c72f13 Merge branch 'soon' into staging 2020-04-09 16:31:35 -04:00
ansuz de6594f4c9 add some XXX notes 2020-04-09 16:31:16 -04:00
ansuz 09bf0a54d8 add access control header 2020-04-09 16:30:22 -04:00
ansuz e527867e2e queue blob and channel deletions per-user 2020-04-09 16:29:52 -04:00
Weblate ebd4998edd Translated using Weblate (Catalan)
Currently translated at 50.8% (633 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
2020-04-09 19:08:24 +02:00
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
ansuz bef18a9320 hotfix 2020-04-08 10:28:26 -04: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
ansuz dca2707ae3 guard against incorrect types in /auth/ 2020-04-07 09:45:21 -04:00
yflory e5bcaeedce Fix regression in the access modal 2020-04-07 15:38:16 +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
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
yflory 20111e8416 Drop support for external URL as avatar 2020-04-06 13:22:56 +02:00
yflory 9da47ebac9 lint compliance 2020-04-06 13:22:22 +02:00
yflory 033b784576 Add max file size in whiteboard 2020-04-06 13:21:08 +02:00
yflory 175ee492a5 Merge branch 'staging' into lightbox 2020-04-06 11:43:13 +02:00
yflory 35394476a6 Improve scrollbars and modal size 2020-04-06 11:42:47 +02:00
ansuz 2b3f6e3464 Merge branch 'soon' into staging 2020-04-03 10:49:51 -04:00
ansuz 9a137e0025 Merge branch 'master' into soon 2020-04-03 10:49:44 -04:00
ansuz aace3c006c Merge branch 'csp-issue' into staging 2020-04-03 10:37:37 -04:00
ansuz 9fa93172cf tolerate trailing slashes in httpSafeDomain 2020-04-03 10:37:23 -04:00