web/cryptpad
Archived
5
0
Fork 0
Code Issues 1 Pull Requests 6 Actions Releases Wiki Activity
8,139 Commits 7 Branches 0 Tags
59ad80d7f16f1627512dd1a826badc27569b1751
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ansuz 59ad80d7f1 support larger upload sizes for users with premium accounts 2020-02-26 13:09:11 -05:00
ansuz 87ef2b0899 Merge branch 'user-admin-logout-everywhere' into staging 2020-02-25 11:37:26 -05:00
ansuz 3f2ebb773b merge master back to staging 2020-02-25 11:20:20 -05:00
ansuz 542150b775 merge server components from staging 2020-02-25 10:09:35 -05:00
ansuz f951951077 merge communities-allow-list and lint compliance 2020-02-25 09:48:41 -05:00
ansuz f0e5fc7614 merge some missing code from communities-allow-list 2020-02-25 09:09:16 -05:00
ansuz ad08fe0c08 silence a few more routine websocket errors 2020-02-25 08:01:25 -05:00
ansuz 9c4693365a logout-everywhere from the userAdmin menu 2020-02-24 18:36:53 -05:00
ansuz 492e9496c8 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-02-24 14:33:02 -05:00
ansuz 21cf2b70c5 update changelog for v3.12.0 (Megaloceros) 2020-02-24 14:32:53 -05:00
ansuz 6f742fc295 WIP changelog 2020-02-21 15:22:51 -05:00
ansuz 021a6b361f remove a bogus XXX note 2020-02-21 14:33:28 -05:00
ansuz e871e1f1e2 bump footer version to 3.12.0 (Megaloceros) 2020-02-21 14:31:11 -05:00
ansuz 033bd361f9 add backwards compatibility with older servers 2020-02-21 13:58:21 -05:00
ansuz cac114bb52 merge staging into pending allow-list work 2020-02-21 13:52:10 -05:00
ansuz 668ea95de2 Merge branch 'soon' into staging 2020-02-21 13:47:03 -05:00
ansuz e8142d983b fix an invalid use of dropChannel 2020-02-21 13:46:48 -05:00
ansuz 386add7c58 fix an invalid use of dropChannel 2020-02-21 13:46:11 -05:00
ansuz 76d369bc83 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-21 13:39:07 -05:00
ansuz 33c12c27a1 ignore successive metadata errors with the same message 2020-02-21 13:38:56 -05:00
ansuz 7ee8778210 kick unauthorized users from restricted channels 
and update dependencies
 2020-02-21 13:05:24 -05:00
ansuz 77785e79af Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 10:59:26 -05:00
ansuz 075eddb1db guard against a typeError if there are no owners 2020-02-21 10:50:59 -05:00
ansuz fe0e02a421 restrict access to metadata 2020-02-21 10:31:10 -05:00
ansuz ad7096d754 Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 08:41:13 -05:00
ansuz 42ffb4efb6 Merge branch 'staging' into communities-allow-list 2020-02-21 08:40:45 -05:00
ansuz 791aad53f2 WIP allow list changes 2020-02-21 08:18:05 -05:00
ansuz 4fee896b5d update chainpad-listmap's dependency chain 2020-02-20 09:51:47 -05:00
ansuz c8b0907fbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-20 09:50:44 -05:00
ansuz 597f417ad6 WIP block history requests that bypass JOIN restriction (where appropriate) 2020-02-19 15:32:15 -05:00
ansuz 79bc8830ef disable access restriction if all owners are removed 2020-02-19 14:39:28 -05:00
ansuz f579c9b059 semi-functional allow-list implementation in historyKeeper 2020-02-19 14:22:12 -05:00
ansuz 0edcdcb1b8 oups! fix a missing callback that's been here for a while... 2020-02-18 16:15:05 -05:00
ansuz 27e57e7af0 oups! fix a missing callback that's been here for a while... 2020-02-18 16:07:14 -05:00
ansuz 505e383f9f test restricted access from the command line 2020-02-18 16:06:06 -05:00
ansuz eac3e4cbcd sketch out some historyKeeper functionality related to access lists 2020-02-18 16:05:12 -05:00
ansuz d5e8fc35f7 Merge branch 'mkTimeout' into communities-allow-list 2020-02-18 15:31:58 -05:00
ansuz 156c37942d implement new metadata commands related to allow lists and mailboxes 2020-02-18 14:16:07 -05:00
ansuz ecce654ca6 add 'resource:' to script-src to enable shared-worker debugging in firefox 2020-02-17 12:48:10 -05:00
ansuz a280cc85d2 Merge branch 'staging' into communities-allow-list 2020-02-17 12:04:41 -05:00
ansuz 626a031115 resolve conflict with master/staging 2020-02-17 12:04:01 -05:00
ansuz ff73e96cb8 reimplement the trim history fix from staging 2020-02-17 12:02:49 -05:00
ansuz a4be6185de merge staging and do a little lint compliance 2020-02-17 11:54:27 -05:00
ansuz f478ae725d Merge branch 'staging' into communities-allow-list 2020-02-17 11:48:56 -05:00
ansuz 79f1280cf3 Merge branch 'soon' into staging 2020-02-17 11:42:08 -05:00
ansuz b56367414b don't overwrite cached indices when new users join a channel 2020-02-17 11:31:00 -05:00
ansuz 253ea0d336 Merge branch 'staging' into communities-allow-list 2020-02-17 10:38:40 -05:00
ansuz e8949168ec lint compliance 2020-02-17 10:30:44 -05:00
ansuz 5dff6535ed add a simple guard against unparsed messages when trimming history 2020-02-17 10:19:51 -05:00
ansuz 8694c17023 sketch out metadata commands for allow lists 2020-02-17 09:26:36 -05:00
ansuz f86196e40a implement shared environment between historyKeeper and RPC 2020-02-17 09:01:10 -05:00
ansuz 8700345ccc add missing connect-src directives to example nginx conf 2020-02-17 08:49:21 -05:00
ansuz 1fc8c1de16 add missing connect-src directives to example nginx conf 2020-02-17 08:48:15 -05:00
ansuz d9ab8d3f62 lint compliance 2020-02-14 16:48:14 -05:00
ansuz 3f606d8c75 remove some duplicated code 2020-02-14 16:45:53 -05:00
ansuz d274be6de4 remove ancient import script 2020-02-14 16:37:00 -05:00
ansuz 725d10fc60 nest storage directory inside './lib' 2020-02-14 16:29:30 -05:00
ansuz 58193a1969 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-14 13:49:23 -05:00
ansuz 38c1700173 Respond to pinning RPCs as soon as possible 
(instead of waiting until you've read an unbounded number
of pin logs while queries back up in memory)

Also replace instances of 'publicKey' with 'safeKey' or 'unsafeKey'
to clearly and correctly indicate their format.
 2020-02-14 13:46:40 -05:00
ansuz cded52f83f replicate existing pinned.load API correctly 2020-02-14 11:45:51 -05:00
ansuz 65f88617cf add support for an optional handler for each pin log 
great for analyzing which files are most in need of optimization
 2020-02-13 18:16:32 -05:00
ansuz 2df65ed446 implement 'mkTimeout' method in common-util 2020-02-13 17:51:02 -05:00
ansuz a172bad30f drop unnecessary reference to 'window' in Util.throttle 2020-02-13 17:50:17 -05:00
ansuz 3dc789cbca replace pinned.js with low-profile streaming implementation 2020-02-13 17:46:10 -05:00
ansuz 609eddc9e1 reimplement the the Pinned.load API 
* recurse into directories on demand
* optimized for lower memory consumption
* less parallelism than before
 2020-02-13 17:41:36 -05:00
ansuz 2345323f0d lint compliance 2020-02-13 17:40:55 -05:00
ansuz 2d6626234b yet another async scheduler, this time supporting flexible runtime control flow based on declarative priority levels 2020-02-13 16:44:11 -05:00
ansuz 4b66899956 Merge branch 'soon' into staging 2020-02-11 17:19:32 -05:00
ansuz 06d3ed93e8 finish changelog for 3.11.0 (LabradorDuck) 2020-02-11 17:19:15 -05:00
ansuz 672725629c Merge branch 'communities-trim' into merge-trim 2020-02-11 11:32:03 -05:00
ansuz c9db3aae78 Merge branch 'staging' into soon 2020-02-11 09:23:53 -05:00
ansuz bd163e65f3 Merge branch 'staging' into soon 2020-02-10 15:46:13 -05:00
ansuz 93abdff397 set codename 'LabradorDuck' for 3.11.0 2020-02-10 15:40:55 -05:00
ansuz 9cac465b08 add missing font-awesome share icon to the safe link hint 2020-02-10 15:39:57 -05:00
ansuz 2a6afcc176 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 13:05:42 -05:00
ansuz 1be01c07ee fix bad copypaste in the example nginx file 2020-02-10 13:04:58 -05:00
ansuz 0e9ba3a88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 11:48:11 -05:00
ansuz bc2febfb8b bump version, drop flow dependency, use newer chainpad-server 2020-02-10 11:47:55 -05:00
ansuz 1231cacef1 remove XXX 2020-02-10 11:21:04 -05:00
ansuz 0c2e5d14b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 11:07:51 -05:00
ansuz 63a36df39b push the pending upload table below the file upload dialog 2020-02-10 11:07:46 -05:00
ansuz cff663e876 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-10 10:01:06 -05:00
ansuz 57be324850 remove some XXX notes 2020-02-10 10:01:02 -05:00
ansuz 68a77885d4 suppress some routine server logs 2020-02-10 09:03:16 -05:00
ansuz 7f22da0f57 fix use of incorrect key format in admin-rpc 2020-02-10 08:07:29 -05:00
ansuz 86b9cc2de1 accidentally merge uncommitted work with staging, resolve merge conflicts 2020-02-10 08:05:43 -05:00
ansuz 7000be0e70 clean up historykeeper 2020-02-07 18:58:57 -05:00
ansuz 802034616c centralize historykeeper-rpc interaction in rpc methods 2020-02-07 12:53:12 -05:00
ansuz b4172676f3 lint compliance 2020-02-05 18:12:09 -05:00
ansuz 3e06c4bfe3 resolve conflict and lint compliance 2020-02-05 18:10:05 -05:00
ansuz 3ab83826e6 WIP changelog 2020-02-05 18:06:40 -05:00
ansuz 342aea705a not about a history-keeper anti-pattern 2020-02-05 18:06:18 -05:00
ansuz f17d14fd99 simpler limit updates 2020-02-05 18:01:48 -05:00
ansuz bde17a62a1 continue refactoring rpc 2020-02-05 17:31:44 -05:00
ansuz d17e180420 add a short delay in the rpc test to give the server time to write metadata to the disk before checking it 2020-02-05 13:41:46 -05:00
ansuz fa525817ba fix broken removePins RPC 2020-02-05 13:05:06 -05:00
ansuz a00a9fd018 don't hang when reading unparseable lines from history 2020-02-05 13:05:05 -05:00
ansuz 14a67b5600 fix broken removePins RPC 2020-02-05 13:03:44 -05:00
ansuz b7ca39715d don't hang when reading unparseable lines from history 2020-02-05 13:03:11 -05:00
ansuz 9395a1ef1a always write lines with a newline 2020-02-05 12:43:39 -05:00