Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz 54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
ansuz 0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
ansuz ce7ebf0326 don't stop users from registering if they cancel out of a prompt 2018-07-09 15:31:20 +02:00
ansuz 16f276a18c fix anon pad import 2018-07-09 14:34:33 +02:00
ansuz a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz 3d4b693722 use correctly scoped variable 2018-07-06 11:54:01 +02:00
ansuz d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz 4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz 57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz 0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
ansuz ab04a7cb46 fix the bug I caused while trying to silence the linter 2018-07-02 17:43:39 +02:00
ansuz a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
ansuz 12cf1993b9 flow compliance for loginBlock RPCs 2018-06-28 16:52:23 +02:00
ansuz 57d0738f32 Merge branch 'modern-users' into staging 2018-06-28 15:30:10 +02:00
ansuz cc6f3dc0e4 lint compliance 2018-06-28 15:25:22 +02:00
ansuz cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
ansuz 7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
ansuz 76c9b01d45 update changelog one more time 2018-06-27 15:13:47 +02:00
ansuz fc6322b105 ignore /block/ 2018-06-27 15:03:48 +02:00
ansuz 2c56972be6 update changelog and example nginx config 2018-06-27 15:03:38 +02:00
ansuz 232ef4c243 Merge branch 'master' of /home/ansuz/Desktop/cryptpad 2018-06-27 13:51:32 +02:00
ansuz 04d080d5a8 2.4.0 changelog 2018-06-27 13:48:36 +02:00
ansuz 6d94f6ce21 roll back to pre-socket.io code 2018-06-26 15:31:57 +02:00
ansuz 02169bfa83 Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.

RIP uptime.

This reverts commit 9195c57445.
2018-06-26 15:30:40 +02:00
ansuz 7dc393a2d2 remove debug log 2018-06-25 15:33:54 +02:00
ansuz d76f3dceab remove comment 2018-06-25 14:30:41 +02:00
ansuz fb5553f918 fix typo 2018-06-25 14:25:37 +02:00
ansuz 9820ac278f address npm warnings 2018-06-25 13:45:25 +02:00
ansuz 4e9baff0b6 bump version 2018-06-25 11:00:59 +02:00
ansuz 01614c4256 verify old user password before proceeding to change passwords 2018-06-22 15:34:50 +02:00
ansuz e03b9fe630 remove login-block dependency from settings 2018-06-22 11:46:08 +02:00
ansuz 85bcaa51f7 export a constant for the number of required bytes at login time
allocate bytes for blockSeed when changing passwords
2018-06-22 11:41:10 +02:00
ansuz da35d94f73 don't require Block in /settings/ 2018-06-22 10:58:46 +02:00
ansuz a037f46b62 Merge branch 'staging' into modern-users 2018-06-22 10:28:11 +02:00
ansuz 567a4d2d98 use more restrictive semver for chainpad-server 2018-06-21 16:54:57 +02:00
ansuz 89e64a7243 dispense bytes for block location 2018-06-21 16:52:04 +02:00
ansuz 990471460c lint compliance 2018-06-21 16:51:28 +02:00
ansuz 10c76c6d4b Merge branch 'staging' into modern-users 2018-06-21 10:42:41 +02:00
ansuz fc35d06c83 Merge branch 'soon' into staging 2018-06-21 10:42:25 +02:00
ansuz 184708f859 fix login from register page 2018-06-21 10:40:09 +02:00
ansuz 6fde027a6c add some TODOs 2018-06-21 10:26:46 +02:00
ansuz 508521664f use nthen to sequence async events 2018-06-21 10:26:23 +02:00
ansuz 9a7abe0b1e Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-21 10:16:25 +02:00
ansuz c2014c5906 a bit of cleanup, bug fixes, and lint compliance 2018-06-21 10:16:16 +02:00
ansuz c3741f847d resolve conflicts from merge with staging 2018-06-20 14:29:13 +02:00
ansuz d03339f20b check for the presence of a blockHash in localStorage when logging in 2018-06-20 14:27:44 +02:00
ansuz 3ba0ad3cf1 get, set, and clear blocks from localStorage 2018-06-19 18:08:14 +02:00
ansuz cb5fa72dba implement removeLoginBlock rpc 2018-06-19 17:17:56 +02:00
ansuz 577dea4c75 clientside implementation of block signing and encryption 2018-06-19 16:38:49 +02:00
ansuz 0365092aaf Merge branch 'staging' into modern-users 2018-06-19 11:32:41 +02:00
ansuz 9d3d8c3ba2 initial implementation of serverside password change RPCs 2018-06-19 11:31:15 +02:00
ansuz 2463dd0c9e Merge branch 'soon' into staging 2018-06-13 13:52:58 +02:00
ansuz 42ed9d2b79 update changelog 2018-06-12 17:08:14 +02:00
ansuz ff25929c18 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 15:50:53 +02:00
ansuz 54b52d681c fix broken share menu resulting from adblock plus triggered by 'share' 2018-06-12 15:50:41 +02:00
ansuz 06582e06dc update markup in de translation 2018-06-12 12:03:25 +02:00
ansuz aa51463a9a Merge branch 'soon' into staging 2018-06-12 12:00:51 +02:00
ansuz 4701a7f415 Merge branch 'features-page' into staging 2018-06-12 11:48:43 +02:00
ansuz 6e6020ef0d rename and optimize images: thanks @MacLemon 2018-06-12 11:42:25 +02:00
ansuz eb49f53884 standardize indentation 2018-06-12 11:32:09 +02:00
ansuz 8def11bea3 define style by class instead of structure 2018-06-12 11:21:12 +02:00
ansuz 9e4fdb7e83 prefix classes with cp 2018-06-11 16:35:19 +02:00
ansuz a109deadc3 remove package-lock.json 2018-06-11 16:28:12 +02:00
ansuz 5a549f75a6 increment version 2018-06-11 15:15:03 +02:00
ansuz 756681211b update home page icons, allow for customization 2018-06-08 17:06:50 +02:00
ansuz 5ae7cdb1e6 add missing key for french translation 2018-06-08 14:56:11 +02:00
ansuz b0039e35d0 add missing translation key for kanban 2018-06-08 14:38:44 +02:00
ansuz eac7d38655 test media-tag, and fix the bug the tests exposed 2018-06-07 14:29:09 +02:00
ansuz 56836b2e28 update changelog 2018-06-01 11:54:24 +02:00
ansuz bd66c8fee8 hacks to handle weird entries in drive 2018-05-18 10:28:31 +02:00
ansuz 2170fcb9ad Merge branch 'kanban' into staging 2018-05-18 10:19:55 +02:00
ansuz a55391d771 bump version 2018-05-17 18:26:52 +02:00
ansuz 818aa45a3a update changelog for v2.1.0 2018-05-17 18:16:06 +02:00
ansuz f218a9c119 correct a copy-pasted comment 2018-05-17 16:10:53 +02:00
ansuz ad39d53d70 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-05-17 12:26:37 +02:00
ansuz 65a53b150c Merge branch 'soon' 2018-05-17 12:26:26 +02:00
ansuz 4ad0ba5c4a Merge branch 'soon' 2018-05-17 11:00:57 +02:00
ansuz 57f2e26d8a Merge branch 'staging' into soon 2018-05-17 11:00:37 +02:00
ansuz 534d5ae006 bump version 2018-05-17 10:41:17 +02:00
ansuz d950b34bdf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-05-17 10:35:59 +02:00
ansuz fb91f5df76 compare flat-dom output against hyperjson 2018-05-17 10:35:48 +02:00
ansuz c9fe0b993e update changelog for v2.0.0 2018-05-04 10:37:22 +02:00
ansuz 4c747e013f on second thought that was a bad idea 2018-05-03 18:46:45 +02:00
ansuz 8ec9021f89 clear stuck tooltips in an interval 2018-05-03 18:45:19 +02:00
ansuz 67fd70b4c7 use mtime instead of atime for expiration 2018-05-03 14:03:56 +02:00
ansuz 8d3545d217 comments :D 2018-05-03 11:56:03 +02:00
ansuz 381d4ac191 make resets explicit 2018-05-03 11:08:56 +02:00
ansuz 89fb718572 Merge branch 'soon' 2018-05-03 10:19:36 +02:00
ansuz b9a74c2119 hide visible effects of race condition, leave a note to remember to fix it 2018-05-03 10:19:14 +02:00
ansuz ac09ba65ce strip both old and new style checkpoint labels before decrypting when fetching history 2018-05-02 14:39:06 +02:00
ansuz 3eb199bca7 bump version to 2.0.0 2018-05-02 11:44:12 +02:00
ansuz 123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
ansuz 8b13bd0be5 lint compliance and merge 2018-05-02 11:07:28 +02:00
ansuz de768869eb add missing semicolons 2018-05-02 10:56:02 +02:00
ansuz e5c35f457c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-05-02 10:46:09 +02:00
ansuz 699a635746 add trailing slash when redirecting to drive 2018-04-30 11:47:53 +02:00
ansuz 41583b7858 Merge branch 'checkpoint-bug' into merge-checkpoint-bug 2018-04-27 17:45:26 +02:00
ansuz 43b8873c9e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-04-19 11:14:07 +02:00
ansuz 6f1c2d5701 add leading space before 'domain' in config.example.js 2018-04-12 17:39:17 +02:00