Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 31c6e7241e Merge branch 'soon' into staging 2019-09-02 15:25:20 +02:00
ansuz 4e5f6edac4 update version to 3.0.1 for a minor release 2019-09-02 11:58:43 +02:00
ansuz c2a6fe082f Merge branch 'soon' 2019-09-02 11:41:26 +02:00
ansuz 05908ac035 store the current time in all pin-log messages 2019-08-30 16:31:08 +02:00
ansuz a291486e3a remove deprecated scripts 2019-08-30 16:21:28 +02:00
ansuz ecdb1505e2 lint compliance 2019-08-30 16:09:38 +02:00
ansuz 1ab4fd7952 advise users against using their emails as their username 2019-08-30 16:05:04 +02:00
ansuz 42528632ac display correct pad expiration time based on /api/config 2019-08-30 15:17:03 +02:00
ansuz 1ec1d8b0e0 make fresh mode the default behaviour 2019-08-30 15:03:22 +02:00
ansuz fcab0d4b6e deprecate common/curve.js in favour of the bower version 2019-08-30 14:41:47 +02:00
ansuz b59f03b949 consider changes to metadata logs as channel activity 2019-08-30 14:30:17 +02:00
ansuz 1b7d984d39 Merge branch 'soon' into staging 2019-08-30 11:57:46 +02:00
ansuz 166ab65cd4 update changelog 2019-08-29 13:22:06 +02:00
ansuz ebf41e93c0 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 12:13:23 +02:00
ansuz 69d48146d5 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 11:31:45 +02:00
ansuz 7d33e261f8 add pending CHANGELOG for v3.0.0 2019-08-28 16:56:58 +02:00
ansuz bf1332451f fix merge conflict 2019-08-27 17:54:31 +02:00
ansuz 113a362724 fix typo which causes ephemeral channels to be stored 2019-08-27 17:46:40 +02:00
ansuz 6fbfa2beea Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 17:08:35 +02:00
ansuz 1400fdbae0 pin to stable nthen version 2019-08-27 17:08:24 +02:00
ansuz 1241d17b43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 11:38:16 +02:00
ansuz 459c2ba7e3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 11:19:13 +02:00
ansuz d6c425fbfb Merge branch 'fix' into staging 2019-08-27 10:28:25 +02:00
ansuz eb6a7f9262 update footer and package.json version to 3.0.0 2019-08-27 10:28:08 +02:00
ansuz 5c7c54f607 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into fix 2019-08-26 18:48:21 +02:00
ansuz 0c9ccffdf3 Merge branch 'staging' into fix 2019-08-26 18:44:30 +02:00
ansuz 874093a126 push something that actually works 2019-08-26 18:42:20 +02:00
ansuz 52e5644234 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-26 18:39:29 +02:00
ansuz 9d40018da3 support cross-origin blobs 2019-08-26 18:39:23 +02:00
ansuz d6fc35cab4 mkdirp the path to metadata before writing 2019-08-26 17:44:21 +02:00
ansuz 8d102ea762 log more 2019-08-26 17:40:14 +02:00
ansuz c18018ca79 Merge branch 'staging' into fix 2019-08-26 17:22:30 +02:00
ansuz 57c5e664bb don't prompt users to upgrade to premium if subscriptions are disabled 2019-08-26 14:07:23 +02:00
ansuz 0ee41bbec6 Merge branch 'staging' into fix 2019-08-26 11:19:16 +02:00
ansuz 689886b9bf always store messages according to the order in which they were received 2019-08-23 13:12:58 +02:00
ansuz a34abd748e rename unclear variable name 2019-08-23 12:43:42 +02:00
ansuz 7642ee9584 log catastrophic errors in getIndex, clean up comments 2019-08-23 12:43:05 +02:00
ansuz 62c23a29a7 simplify validateKey validation 2019-08-23 12:28:17 +02:00
ansuz b82c0a420a merge latest staging 2019-08-22 18:01:20 +02:00
ansuz 84e1057153 address remaining notes in the storage api 2019-08-22 17:48:28 +02:00
ansuz 204f6b3af1 remove some comments 2019-08-22 17:01:58 +02:00
ansuz c9f569b109 optimize getIndex so identical indexes are never computed concurrently 2019-08-22 17:00:51 +02:00
ansuz 096c8eb2ba check that the user-supplied validateKey is actually before doing any more work 2019-08-22 16:59:46 +02:00
ansuz 71e44f46c7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-22 14:52:38 +02:00
ansuz 337e0bd141 update the server's cache whenever we write metadata 2019-08-22 14:52:30 +02:00
ansuz 53f04d096d update the server's cache whenever we write metadata 2019-08-22 14:52:11 +02:00
ansuz 347b7a639b update XXX comment 2019-08-22 14:40:01 +02:00
ansuz a63bea1f59 remove invalid callback which would totally break channelBytes 2019-08-22 11:50:06 +02:00
ansuz 3c1aadd6c1 archive metadata even if there is no corresponding channel log 2019-08-22 11:49:43 +02:00
ansuz 55ea7f13fd fix invalid conditional which would block task scheduling 2019-08-22 11:49:02 +02:00
ansuz 338f967149 restructure onChannelMessage 2019-08-22 11:21:10 +02:00
ansuz 8af7308da4 set a default value and describe disableIntegratedTasks in the example config 2019-08-21 14:06:57 +02:00
ansuz c17938a8e3 cache the metadata to save a few lookups 2019-08-21 14:04:23 +02:00
ansuz c5de4164bc make sure getIndex is always async in historyKeeper 2019-08-21 13:49:39 +02:00
ansuz 255f208a4a always enable tasks, but allow for admins to disable the integrated loop in the main server process 2019-08-21 13:36:27 +02:00
ansuz d30470f1aa correct an invalid comment 2019-08-21 13:22:43 +02:00
ansuz cdfbaf5ad9 write tasks along with metadata 2019-08-21 13:22:05 +02:00
ansuz 9623efd10b fix another non-standard instance of checking for metadata 2019-08-21 13:05:01 +02:00
ansuz b360d79a76 simplify 'isNewChannel' rpc 2019-08-21 12:54:24 +02:00
ansuz 7e13f7e3ca validate owners against amended metadata when removing channels 2019-08-21 12:46:45 +02:00
ansuz 31f7c4b90a validate owners against amended metadata when clearing channels 2019-08-21 12:45:19 +02:00
ansuz 8c92d3dc02 move metadata to the top of the file with all the other imports 2019-08-21 12:30:01 +02:00
ansuz c5ca82f0e1 throw errors if you try to update expiration times, as this isn't implemented yet 2019-08-21 12:28:19 +02:00
ansuz 0a0c64d240 only increment the metadata line index if you can parse the line 2019-08-21 12:26:46 +02:00
ansuz 1c37ec7aee prevent duplicated owners in metadata amendments 2019-08-21 12:25:17 +02:00
ansuz a3a7bcbe35 add comments for lots of functions 2019-08-21 12:15:27 +02:00
ansuz d6d7f4f601 include the size of the metadata log in the computed size of a channel 2019-08-21 12:14:49 +02:00
ansuz 2aebadcff3 use the correct path for channel data when restoring logs from the archive 2019-08-21 12:13:39 +02:00
ansuz 238d547a46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-20 17:37:43 +02:00
ansuz 50a6479854 merge latest staging into editable metadata 2019-08-20 17:32:46 +02:00
ansuz 1521220560 fix loading screen spinner color to match CryptPad icon 2019-08-19 17:32:37 +02:00
ansuz aedc92362a update chainpad-listmap dependency version 2019-08-19 15:25:42 +02:00
ansuz a368948fb6 handle errors when converting folders to shared folders 2019-08-19 12:06:06 +02:00
ansuz 7d583975b8 fix a few things, add comments for others 2019-08-19 11:56:52 +02:00
ansuz 5dacc6ceeb Merge branch 'soon' into staging 2019-08-16 17:39:54 +02:00
ansuz 04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
ansuz 1c55ac15d5 Merge branch 'staging' into editable-metadata 2019-08-16 16:43:42 +02:00
ansuz dc65213130 Merge branch 'merge-plainTextFiles' into staging 2019-08-16 16:02:53 +02:00
ansuz bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
ansuz 6a5ab1ff87 update 'isNewChannel' 2019-08-14 17:34:08 +02:00
ansuz 9498669ffe remove some stale comments 2019-08-14 17:32:30 +02:00
ansuz 1e2a6405d0 make validation of channel options more strict in GET_HISTORY 2019-08-14 17:10:40 +02:00
ansuz 79e5edbdfe identify classic metadata messages by the presence of a channel attribute 2019-08-14 17:05:18 +02:00
ansuz 1c89e8d6ac A few updates for editable metadata
* add and update many comments
* correctly handle metadata for young channels and range requests
* add a simple implementation of 'writeMetadata'
2019-08-14 14:37:54 +02:00
ansuz f5c318f155 Merge branch 'staging' into editable-metadata 2019-08-13 15:30:11 +02:00
ansuz b7c75ea2d4 Merge branch 'staging' into editable-metadata 2019-08-13 11:05:55 +02:00
ansuz 1d13264a0d WIP minor amendments and notes for editable metadata 2019-08-13 11:04:31 +02:00
ansuz 1fb2a0976c improve readability with 'readMore' to describe what the callback does 2019-08-13 11:02:42 +02:00
ansuz ce847700c4 expose the index of the metadata log processor 2019-08-12 15:26:23 +02:00
ansuz 206de52ee8 call back from writeMetadata 2019-08-12 15:25:37 +02:00
ansuz abe654f565 many more comments. cache metadata even in the event of a metadata stream error 2019-07-23 13:59:12 +02:00
ansuz bf058d8042 prevent multiple callbacks when reading dedicated metadata 2019-07-23 13:56:37 +02:00
ansuz 9f959eccea Merge branch 'staging' into editable-metadata 2019-07-23 11:34:57 +02:00
ansuz 8644784b03 identify a false positive for IS_NEW_CHANNEL rpc 2019-07-23 11:34:23 +02:00
ansuz 9646cbf5db tune up metadata retrieval and caching in historyKeeper/computeIndex 2019-07-23 11:33:59 +02:00
ansuz 754da8b14f add a warning to 'getHash' in historyKeeper 2019-07-23 11:27:49 +02:00
ansuz 54c2a61cd0 update some variable names to better reflect usage 2019-07-22 15:42:29 +02:00
ansuz 9a178f35ae add a few more comments and standardize an inline regexp 2019-07-22 15:36:37 +02:00
ansuz ddb1b7b019 add a bunch of comments to the historyKeeper 2019-07-22 15:34:36 +02:00
ansuz f2a7f8b7bc add some comments and rename some misleading variables 2019-07-18 12:16:53 +02:00