 ansuz
|
9cb92d2e6f
|
Merge branch 'soon' into staging
|
2020-03-11 16:52:09 -04:00 |
|
|
ansuz
|
e80a81a2bb
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2020-03-11 16:34:10 -04:00 |
|
|
ansuz
|
d4038344ba
|
stop iterating over tasks if you can't read the root directory
|
2020-03-11 16:34:00 -04:00 |
|
|
ansuz
|
f2729ee9e2
|
Merge branch 'soon' into staging
|
2020-03-10 11:59:52 -04:00 |
|
|
ansuz
|
6b657c47ce
|
change an XXX to a TODO
|
2020-03-10 09:49:55 -04:00 |
|
|
ansuz
|
45601068ae
|
lint compliance
|
2020-03-10 09:19:35 -04:00 |
|
|
ansuz
|
11369e553d
|
downgrade an 'XXX' note to a 'TODO'
|
2020-03-10 09:18:36 -04:00 |
|
|
ansuz
|
b9a07ca650
|
diagnose some unhandled errors in rpc tests
|
2020-03-09 18:18:26 -04:00 |
|
|
ansuz
|
461c809e4f
|
update chainpad-server dependency
|
2020-03-09 17:42:50 -04:00 |
|
|
ansuz
|
4e8ebac3c1
|
guard against the possible non-existence of metadata for a channel
|
2020-03-09 17:42:10 -04:00 |
|
|
ansuz
|
bb23b1249e
|
update changelog for the northern white rhino release
|
2020-03-06 19:32:08 -05:00 |
|
|
ansuz
|
e26ed7bb83
|
fix mermaid scroll jank
|
2020-03-06 14:21:56 -05:00 |
|
|
ansuz
|
d4ca5e7d34
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-06 11:43:46 -05:00 |
|
|
ansuz
|
b32f3e34af
|
fix local worker debugging on firefox
|
2020-03-06 11:43:34 -05:00 |
|
|
ansuz
|
140c8f1049
|
update chainpad-server dependency
|
2020-03-06 11:43:12 -05:00 |
|
|
ansuz
|
6d8cdca7a3
|
add 'rejected' field to metadata when getMetadata requests are blocked
|
2020-03-05 12:09:18 -05:00 |
|
|
ansuz
|
6f7307c446
|
use loggedIn instead of accountName in the toolbar
|
2020-03-04 14:09:28 -05:00 |
|
|
ansuz
|
e3042c94d8
|
make 'log-out-everywhere' end the local session as well
|
2020-03-04 14:08:08 -05:00 |
|
|
ansuz
|
9d8bb43d03
|
finally untangle metadata and index caches
|
2020-03-04 12:56:33 -05:00 |
|
|
ansuz
|
32d769447a
|
begin standardizing our method of streaming lines from files
|
2020-03-04 11:38:14 -05:00 |
|
|
ansuz
|
35eca2c5d2
|
pull file streaming out into its own file, leave a few notes
|
2020-03-04 11:38:14 -05:00 |
|
|
ansuz
|
ccd6e1d6df
|
lint compliance, simplify a test condition
|
2020-03-04 09:59:43 -05:00 |
|
|
ansuz
|
ce6cf6f727
|
revert some changes that couldn't have possibly worked
|
2020-03-04 09:59:17 -05:00 |
|
|
ansuz
|
c53f378582
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-04 09:54:08 -05:00 |
|
|
ansuz
|
b126e4456b
|
simplify quota logic
|
2020-03-03 16:55:40 -05:00 |
|
|
ansuz
|
53ed247bc2
|
expose maxUploadSize and premiumUploadSize via /api/config
|
2020-03-03 16:47:44 -05:00 |
|
|
ansuz
|
50b9c27dcb
|
finalize one more test
|
2020-03-03 16:03:31 -05:00 |
|
|
ansuz
|
8fbb32c5d7
|
add a few more checks to the rpc tests
|
2020-03-03 16:00:39 -05:00 |
|
|
ansuz
|
170aa6d47e
|
clean up a few tasks related to allow lists
|
2020-03-03 15:52:49 -05:00 |
|
|
ansuz
|
92325a27f7
|
Merge branch 'soon' into staging
|
2020-03-02 12:49:39 -05:00 |
|
|
ansuz
|
57eb61aa17
|
update footer and package version for next release
|
2020-03-02 12:48:10 -05:00 |
|
|
ansuz
|
e633f3b445
|
ignore some local scripts
|
2020-03-02 12:46:05 -05:00 |
|
|
ansuz
|
7f2d8e85b8
|
Merge branch 'small-config' into staging
|
2020-03-02 09:53:42 -05:00 |
|
|
ansuz
|
2f00ff3278
|
simplify check-in deactivation
|
2020-02-28 14:24:53 -05:00 |
|
|
ansuz
|
92896fb919
|
rearrange a big part of the example config file
|
2020-02-28 14:24:03 -05:00 |
|
|
ansuz
|
c371a257bf
|
WIP example config reorganization
|
2020-02-28 13:17:02 -05:00 |
|
|
ansuz
|
e70c3ff0ab
|
add some default config values and warn if provided values seem incorrect
|
2020-02-28 12:01:52 -05:00 |
|
|
ansuz
|
03ff9bd0d7
|
start deprecating usage of myDomain
|
2020-02-28 11:45:41 -05:00 |
|
|
ansuz
|
de6b9e2228
|
apply some defaults when loading the config
|
2020-02-28 10:50:30 -05:00 |
|
|
ansuz
|
94d8e7f2c2
|
provide a consistent type for 'customLimits'
|
2020-02-28 10:49:20 -05:00 |
|
|
ansuz
|
3cf09924ae
|
fix default CSP headers
|
2020-02-28 10:46:44 -05:00 |
|
|
ansuz
|
8d509fd6d5
|
Merge branch 'staging' into small-config
|
2020-02-27 15:25:39 -05:00 |
|
|
ansuz
|
c26560e3f9
|
commit stashed admin-rpc refactor
|
2020-02-27 15:00:31 -05:00 |
|
|
ansuz
|
02fc343727
|
Merge branch 'staging' into small-config
|
2020-02-27 13:54:15 -05:00 |
|
|
ansuz
|
5eefc6d0aa
|
Merge branch 'bigger-uploads' into staging
|
2020-02-27 13:49:35 -05:00 |
|
|
ansuz
|
74771f13f5
|
implement caching for /api/config responses
|
2020-02-27 13:48:19 -05:00 |
|
|
ansuz
|
0989595358
|
lint compliance
|
2020-02-27 13:40:48 -05:00 |
|
|
ansuz
|
d2bae175c4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-02-27 13:26:36 -05:00 |
|
|
ansuz
|
3df47a1415
|
continued WIP config reorganization
|
2020-02-27 13:24:19 -05:00 |
|
|
ansuz
|
294a444603
|
WIP removing defaults from the example config file
|
2020-02-27 13:09:12 -05:00 |
|
|
ansuz
|
08941fa85b
|
remove log statements from login process
|
2020-02-27 12:53:14 -05:00 |
|
|
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 |
|