Commit Graph

  • 89262cd29e resolve silly conflict and merge staging ansuz 2020-04-09 16:35:24 -04:00
  • 44a3c72f13 Merge branch 'soon' into staging ansuz 2020-04-09 16:31:35 -04:00
  • de6594f4c9 add some XXX notes ansuz 2020-04-09 16:31:16 -04:00
  • 09bf0a54d8 add access control header ansuz 2020-04-09 16:30:22 -04:00
  • e527867e2e queue blob and channel deletions per-user ansuz 2020-04-09 16:29:52 -04:00
  • ebd4998edd Translated using Weblate (Catalan) Weblate 2020-04-09 19:08:12 +02:00
  • 62fde59a89 temp yflory 2020-04-09 16:06:04 +02:00
  • bd3e18d1a8 only cache a user's pinned channels if there are no errors when loading them ansuz 2020-04-08 12:08:26 -04:00
  • cba8f5fce6 Merge branch 'staging' into stoppegp-code-authorcolors-PR yflory 2020-04-08 17:03:30 +02:00
  • ee3adccafc Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR yflory 2020-04-08 17:03:09 +02:00
  • bef18a9320 hotfix ansuz 2020-04-08 10:28:26 -04:00
  • 7fac997e93 increase some file storage timeouts related to streams ansuz 2020-04-08 09:38:48 -04:00
  • 95965c1dee keep a parallel implementation of the pin loader to validate the new one ansuz 2020-04-07 20:03:41 -04:00
  • 272c1007db authorcolor storage optimizations stoppegp 2020-04-07 20:49:36 +02:00
  • 56031a5c14 authorcolor storage optimization, add undefined checks before access, code styling stoppegp 2020-04-07 20:30:55 +02:00
  • 79325b8cca bugfix authorcolors: wrong end position on multiline edit stoppegp 2020-04-07 19:07:12 +02:00
  • 5f7bc9fca5 fix remove author color button when nothing is selected stoppegp 2020-04-07 17:14:57 +02:00
  • 1551a1b969 lint compliance yflory 2020-04-07 17:14:06 +02:00
  • 0ccc57f6f7 Protect current pad keys in the unsafe iframe yflory 2020-04-07 17:12:06 +02:00
  • 43904df0fb Display properties modal in the secure iframe yflory 2020-04-07 17:04:39 +02:00
  • 8696ecc692 add 'remove authorcolors' button stoppegp 2020-04-07 16:52:38 +02:00
  • 45b5eb7cac add basic author colors to code app stoppegp 2020-04-07 16:08:28 +02:00
  • dca2707ae3 guard against incorrect types in /auth/ ansuz 2020-04-07 09:45:21 -04:00
  • ca8c50ca37 Merge branch 'staging' into secureiframe yflory 2020-04-07 15:41:49 +02:00
  • e5bcaeedce Fix regression in the access modal yflory 2020-04-07 15:38:16 +02:00
  • 4f838777ab Merge branch 'q' into secureiframe yflory 2020-04-07 15:24:17 +02:00
  • 2aec7c2569 Open the access modal in the secure iframe yflory 2020-04-07 15:24:12 +02:00
  • 6103588faa Fix access modal bug introduced with the latest commit yflory 2020-04-07 15:22:40 +02:00
  • 19a0dafbe1 Merge branch 'q' into secureiframe yflory 2020-04-07 14:54:48 +02:00
  • 62187d855f lint compliance yflory 2020-04-07 14:29:58 +02:00
  • fc2cd19821 lint compliance yflory 2020-04-07 14:29:31 +02:00
  • 894a355f0a Merge filepicker and share iframes yflory 2020-04-07 14:27:44 +02:00
  • 4672bf794b Make sure we don't try to get metadata for blobs yflory 2020-04-07 11:03:35 +02:00
  • 9de345044a Prompt anonymous users to login if they should create a checkpoint in oo yflory 2020-04-07 10:47:57 +02:00
  • e1069b0abb 3.15.0 changelog ansuz 2020-04-06 20:02:33 -04:00
  • 2e290a6667 last minute fixes and notes ansuz 2020-04-06 18:21:07 -04:00
  • a57bf94058 remove XXX note ansuz 2020-04-06 11:31:31 -04:00
  • 9ef755c07b update minor version and codename ansuz 2020-04-06 11:26:34 -04:00
  • a834d653aa Fix download button size in mediatag preview yflory 2020-04-06 16:48:42 +02:00
  • bee2a44c5a Merge remote-tracking branch 'origin/staging' into staging David Benqué 2020-04-06 15:43:21 +01:00
  • f95c385c82 filepicker button David Benqué 2020-04-06 15:42:26 +01:00
  • e1be241406 filepicker thumbnail style David Benqué 2020-04-06 15:42:14 +01:00
  • 7434c344f5 Merge branch 'soon' into staging ansuz 2020-04-06 10:29:19 -04:00
  • 7027033ed1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-04-06 10:29:01 -04:00
  • c53675c9d5 WIP worker rpc call queue ansuz 2020-04-06 10:28:26 -04:00
  • 3f126f1bec Translated using Weblate (German) Weblate 2020-04-06 16:27:15 +02:00
  • 6ea958c7bd Translated using Weblate (Finnish) Weblate 2020-04-06 16:27:15 +02:00
  • f5de72dcb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-06 16:27:12 +02:00
  • 15d86c9bd1 Merge branch 'pcs' into staging yflory 2020-04-06 16:26:38 +02:00
  • 8370f3121c Remove XXX yflory 2020-04-06 16:26:29 +02:00
  • d802173325 remove an invalid line ansuz 2020-04-06 10:18:11 -04:00
  • 90518224fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-04-06 10:16:12 -04:00
  • 5196440e65 guard against a typeError when httpSafeOrigin is not defined ansuz 2020-04-06 10:16:02 -04:00
  • 3aefc3a893 Fix icon size in the new pad modal yflory 2020-04-06 16:13:51 +02:00
  • 0f21f3118b Fix lightbox errors yflory 2020-04-06 16:00:01 +02:00
  • c29b7d3389 Fix reference error yflory 2020-04-06 15:52:13 +02:00
  • 20111e8416 Drop support for external URL as avatar yflory 2020-04-06 13:22:56 +02:00
  • 9da47ebac9 lint compliance yflory 2020-04-06 13:22:22 +02:00
  • 033b784576 Add max file size in whiteboard yflory 2020-04-06 13:21:08 +02:00
  • 175ee492a5 Merge branch 'staging' into lightbox yflory 2020-04-06 11:43:13 +02:00
  • 35394476a6 Improve scrollbars and modal size yflory 2020-04-06 11:42:47 +02:00
  • 2b3f6e3464 Merge branch 'soon' into staging ansuz 2020-04-03 10:49:51 -04:00
  • 9a137e0025 Merge branch 'master' into soon ansuz 2020-04-03 10:49:44 -04:00
  • aace3c006c Merge branch 'csp-issue' into staging ansuz 2020-04-03 10:37:37 -04:00
  • 9fa93172cf tolerate trailing slashes in httpSafeDomain ansuz 2020-04-03 10:37:23 -04:00
  • 427389d1c7 Translated using Weblate (French) Weblate 2020-04-03 16:35:47 +02:00
  • 7ccfe7a673 Translated using Weblate (English) Weblate 2020-04-03 16:35:47 +02:00
  • 18a4d2a72c Merge duplicated code between framework and whiteboard yflory 2020-04-03 15:31:42 +02:00
  • 7ca45eac72 Add preview for mermaid graphs in code yflory 2020-04-03 15:01:52 +02:00
  • 3bc32f6085 Start at the correct index when previewing multiple mediatags yflory 2020-04-03 12:32:25 +02:00
  • b4c61ee753 Fix preview modal not stopping keydown propagation in drive yflory 2020-04-03 12:31:39 +02:00
  • c6fa00b14c Add a start value to the new debug tool to simulate a user joining from a checkpoint yflory 2020-04-03 11:46:05 +02:00
  • ae78f0a5df Merge branch 'staging' into debugtime yflory 2020-04-03 11:20:03 +02:00
  • 5739773378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-03 11:19:47 +02:00
  • 902e9624e8 Don't send encrypted messages to chainpad yflory 2020-04-03 11:19:35 +02:00
  • 8a658336a7 Fix issues with the new debugging code yflory 2020-04-03 11:19:18 +02:00
  • adfd1eaaa2 avoid a silly typeError in the event of an error ansuz 2020-04-02 22:57:57 -04:00
  • 3b05d24f10 wip csp issue ansuz 2020-04-02 17:46:29 -04:00
  • 2daf759299 remove clickable items from rendered mermaid ansuz 2020-04-02 15:39:55 -04:00
  • 110a26cc85 Merge branch 'soon' into staging ansuz 2020-04-02 13:11:36 -04:00
  • d12fad3420 Fix kanban edit modal not locked on disconnect yflory 2020-04-02 16:16:40 +02:00
  • 572f81877f Fix reconnecting issues after EUNKNOWN and ENOENT yflory 2020-04-02 15:28:33 +02:00
  • c0f8129675 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-02 10:25:36 +02:00
  • 32406a5995 Merge branch 'master' into staging yflory 2020-04-02 10:23:09 +02:00
  • 1169156e55 Replay history in order yflory 2020-04-02 10:21:12 +02:00
  • 1f3e47e109 Translated using Weblate (Italian) Weblate 2020-04-01 11:41:10 +02:00
  • 0c65a69bab resolve merge conflict ansuz 2020-04-01 17:45:56 -04:00
  • 834c96a4fc update comments and remove some notes ansuz 2020-04-01 17:43:40 -04:00
  • ed5d97f899 WIP history-keeper fixes ansuz 2020-04-01 11:48:16 -04:00
  • 572db00987 Preview multiple mediatags yflory 2020-04-01 12:04:31 +02:00
  • 81b460abd8 Open pdf in the file app yflory 2020-03-31 17:55:31 +02:00
  • d8d515a450 Add spinner while loading preview yflory 2020-03-31 17:03:16 +02:00
  • 6a10ec711a Preview mediatag in the drive and in diffMarked yflory 2020-03-31 16:43:00 +02:00
  • 817309d602 Move code from ui-elements to common-interface yflory 2020-03-31 10:38:42 +02:00
  • 179e7d68b4 Add new common-mediatag file yflory 2020-03-31 10:38:27 +02:00
  • b27eb956df Merge branch 'staging' into lightbox yflory 2020-03-31 10:21:54 +02:00
  • eddbe80eef Merge branch 'soon' into staging ansuz 2020-03-30 18:30:34 -04:00
  • 1a825ad664 Merge branch 'master' into soon ansuz 2020-03-30 18:30:27 -04:00
  • ad118222d0 add a new test to send a stream of data to a mailbox ansuz 2020-03-30 18:27:57 -04:00
  • 3d8e78a268 fix overly broad config interpretation for daily check ansuz 2020-03-30 18:27:14 -04:00