web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • ad08fe0c08 silence a few more routine websocket errors ansuz 2020-02-25 08:01:25 -05:00
  • 9c4693365a logout-everywhere from the userAdmin menu ansuz 2020-02-24 18:36:53 -05:00
  • 492e9496c8 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon ansuz 2020-02-24 14:33:02 -05:00
  • 21cf2b70c5 update changelog for v3.12.0 (Megaloceros) ansuz 2020-02-24 14:32:53 -05:00
  • e328ae97fd change owner icon David Benqué 2020-02-24 16:42:28 +00:00
  • 8eaf197b5b Disable 'make a copy' for spreadsheets in the drive yflory 2020-02-24 16:40:23 +01:00
  • 99f04c3d6f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-24 16:32:35 +01:00
  • f103a0fb08 Fix dropping files in non-ROOT categories in the drive yflory 2020-02-24 16:32:18 +01:00
  • 20b591a39c Translated using Weblate (German) Weblate 2020-02-22 18:53:08 +01:00
  • 6e6ba73eca Remove XXX yflory 2020-02-24 14:55:29 +01:00
  • c6deabe79c Fix order of 'copy' button in the toolbar yflory 2020-02-24 14:53:52 +01:00
  • 59d23ef5ff Fix issues with trim history button yflory 2020-02-24 11:28:20 +01:00
  • 6f742fc295 WIP changelog ansuz 2020-02-21 15:22:51 -05:00
  • 021a6b361f remove a bogus XXX note ansuz 2020-02-21 14:33:28 -05:00
  • e871e1f1e2 bump footer version to 3.12.0 (Megaloceros) ansuz 2020-02-21 14:31:11 -05:00
  • 033bd361f9 add backwards compatibility with older servers ansuz 2020-02-21 13:58:21 -05:00
  • cac114bb52 merge staging into pending allow-list work ansuz 2020-02-21 13:52:10 -05:00
  • 668ea95de2 Merge branch 'soon' into staging ansuz 2020-02-21 13:47:03 -05:00
  • e8142d983b fix an invalid use of dropChannel ansuz 2020-02-21 13:46:11 -05:00
  • 386add7c58 fix an invalid use of dropChannel ansuz 2020-02-21 13:46:11 -05:00
  • 76d369bc83 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-21 13:39:07 -05:00
  • 33c12c27a1 ignore successive metadata errors with the same message ansuz 2020-02-21 13:38:56 -05:00
  • 7ee8778210 kick unauthorized users from restricted channels ansuz 2020-02-21 13:05:07 -05:00
  • 78c292bc2e Translated using Weblate (Italian) Weblate 2020-02-21 17:16:56 +01:00
  • e292a0b295 Translated using Weblate (French) Weblate 2020-02-21 17:16:56 +01:00
  • 01ba2c4d40 Translated using Weblate (English) Weblate 2020-02-21 17:16:56 +01:00
  • 316d2a4689 Translated using Weblate (German) Weblate 2020-02-21 17:16:55 +01:00
  • ff97c2cf63 Add (copy) to the title for copied pads yflory 2020-02-21 17:10:50 +01:00
  • 77785e79af Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list ansuz 2020-02-21 10:59:26 -05:00
  • 075eddb1db guard against a typeError if there are no owners ansuz 2020-02-21 10:50:59 -05:00
  • fe0e02a421 restrict access to metadata ansuz 2020-02-21 10:31:10 -05:00
  • cebb2d3900 Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list yflory 2020-02-21 16:25:50 +01:00
  • 0990148810 Fix team ownership in the access modal yflory 2020-02-21 16:25:43 +01:00
  • 3abe522a9f Make a copy yflory 2020-02-21 15:45:16 +01:00
  • ad7096d754 Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list ansuz 2020-02-21 08:41:13 -05:00
  • 42ffb4efb6 Merge branch 'staging' into communities-allow-list ansuz 2020-02-21 08:40:45 -05:00
  • 791aad53f2 WIP allow list changes ansuz 2020-02-21 08:18:05 -05:00
  • 2cceb54aac Fix cornerPopup timeout not always applied yflory 2020-02-21 12:15:34 +01:00
  • d0bce11c21 Fix errors when an anonymous user leaves the shared worker yflory 2020-02-21 12:07:53 +01:00
  • d3939e87b2 Fix readOnly mode in spreadsheets yflory 2020-02-20 16:39:50 +01:00
  • 4fee896b5d update chainpad-listmap's dependency chain ansuz 2020-02-20 09:51:47 -05:00
  • c8b0907fbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-20 09:50:44 -05:00
  • e6c948febb Display ERESTRICTED error in the UI yflory 2020-02-20 12:12:22 +01:00
  • 866ce6fb7d Add translation key yflory 2020-02-20 11:43:35 +01:00
  • 5a189862eb Fix color yflory 2020-02-20 11:31:54 +01:00
  • 9d5bf7e1bb Disable allow list for files and shared folders yflory 2020-02-20 11:30:38 +01:00
  • 597f417ad6 WIP block history requests that bypass JOIN restriction (where appropriate) ansuz 2020-02-19 15:32:15 -05:00
  • 79bc8830ef disable access restriction if all owners are removed ansuz 2020-02-19 14:39:28 -05:00
  • f579c9b059 semi-functional allow-list implementation in historyKeeper ansuz 2020-02-19 14:22:12 -05:00
  • 521db379a0 Add access button in all the apps yflory 2020-02-19 19:05:29 +01:00
  • 620995506e lint compliance yflory 2020-02-19 18:52:17 +01:00
  • 43492b6df5 Add mute pad option yflory 2020-02-19 18:51:04 +01:00
  • b4ca18d7c2 Fix access modal bug yflory 2020-02-19 17:26:31 +01:00
  • 57c360ebf6 Refresh access modal when other tabs make changes yflory 2020-02-19 17:20:37 +01:00
  • bd0e4e66bb Fix allow list issues yflory 2020-02-19 16:35:12 +01:00
  • d0eb96815d Merge remote-tracking branch 'origin/communities-allow-list' into communities-allow yflory 2020-02-19 16:00:11 +01:00
  • e861cd3ab7 lint compliance yflory 2020-02-19 15:58:30 +01:00
  • 5f8ae61bd4 Add request access button to the access modal yflory 2020-02-19 15:56:25 +01:00
  • ef4188db5b Fix translation keys and fix UI yflory 2020-02-19 14:31:59 +01:00
  • 175423fee4 Add translation keys yflory 2020-02-19 13:14:50 +01:00
  • 17113f298c Display allow list state in access modal yflory 2020-02-19 13:03:49 +01:00
  • 0edcdcb1b8 oups! fix a missing callback that's been here for a while... ansuz 2020-02-18 16:07:14 -05:00
  • 27e57e7af0 oups! fix a missing callback that's been here for a while... ansuz 2020-02-18 16:07:14 -05:00
  • 505e383f9f test restricted access from the command line ansuz 2020-02-18 16:06:06 -05:00
  • eac3e4cbcd sketch out some historyKeeper functionality related to access lists ansuz 2020-02-18 16:05:12 -05:00
  • d5e8fc35f7 Merge branch 'mkTimeout' into communities-allow-list ansuz 2020-02-18 15:31:58 -05:00
  • 156c37942d implement new metadata commands related to allow lists and mailboxes ansuz 2020-02-18 14:16:07 -05:00
  • 04009bf9bb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-18 17:24:43 +01:00
  • d48cecf28e Load mailboxes after teams yflory 2020-02-18 17:24:28 +01:00
  • 72564a7cfe Merge remote-tracking branch 'origin/staging' into staging David Benqué 2020-02-18 17:23:46 +01:00
  • 70b87f31dd Translated using Weblate (French) Weblate 2020-02-18 17:23:12 +01:00
  • 7cf9758428 Translated using Weblate (English) Weblate 2020-02-18 17:23:12 +01:00
  • 9943e3be78 Translated using Weblate (Italian) Weblate 2020-02-18 17:23:12 +01:00
  • d6c3ad1597 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-18 17:05:17 +01:00
  • f04a6056ae Fix race condition with team access rights #497 yflory 2020-02-18 17:04:44 +01:00
  • 3647d583f8 Add allowList tab yflory 2020-02-18 16:10:39 +01:00
  • 99949ce838 Merge remote-tracking branch 'origin/staging' into staging David Benqué 2020-02-18 14:24:11 +01:00
  • 1f99c185f6 add new error key David Benqué 2020-02-18 14:14:46 +01:00
  • 64964e1f80 remove XXXs related to keys David Benqué 2020-02-18 14:14:29 +01:00
  • 0a45d48710 Improve ownership UI yflory 2020-02-18 11:12:50 +01:00
  • 81a0bbb0ef Add owners tab yflory 2020-02-18 10:28:36 +01:00
  • ecce654ca6 add 'resource:' to script-src to enable shared-worker debugging in firefox ansuz 2020-02-17 12:48:10 -05:00
  • a280cc85d2 Merge branch 'staging' into communities-allow-list ansuz 2020-02-17 12:04:41 -05:00
  • 626a031115 resolve conflict with master/staging ansuz 2020-02-17 12:04:01 -05:00
  • ff73e96cb8 reimplement the trim history fix from staging ansuz 2020-02-17 12:02:49 -05:00
  • a4be6185de merge staging and do a little lint compliance ansuz 2020-02-17 11:54:27 -05:00
  • f478ae725d Merge branch 'staging' into communities-allow-list ansuz 2020-02-17 11:48:56 -05:00
  • 79f1280cf3 Merge branch 'soon' into staging ansuz 2020-02-17 11:42:08 -05:00
  • b56367414b don't overwrite cached indices when new users join a channel ansuz 2020-02-17 11:31:00 -05:00
  • 253ea0d336 Merge branch 'staging' into communities-allow-list ansuz 2020-02-17 10:38:40 -05:00
  • e8949168ec lint compliance ansuz 2020-02-17 10:30:44 -05:00
  • 5dff6535ed add a simple guard against unparsed messages when trimming history ansuz 2020-02-17 10:19:51 -05:00
  • 8694c17023 sketch out metadata commands for allow lists ansuz 2020-02-17 09:26:36 -05:00
  • f86196e40a implement shared environment between historyKeeper and RPC ansuz 2020-02-17 09:01:10 -05:00
  • 4ec6d8072c Merge branch 'staging' into communities-allow yflory 2020-02-17 14:59:14 +01:00
  • 8700345ccc add missing connect-src directives to example nginx conf ansuz 2020-02-17 08:48:15 -05:00
  • 1fc8c1de16 add missing connect-src directives to example nginx conf ansuz 2020-02-17 08:48:15 -05:00
  • de820dc0d1 Split properties modal into 2 modals yflory 2020-02-17 14:07:29 +01:00
  • ff895bbc82 Move inner files yflory 2020-02-17 10:53:04 +01:00
  • d9ab8d3f62 lint compliance ansuz 2020-02-14 16:48:14 -05:00