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 |
|
yflory
|
6dc7e7eff4
|
Disable WebWorkers by default
|
2018-06-26 14:15:25 +02:00 |
|
yflory
|
bfb850554d
|
Fix the contacts app with workers
|
2018-06-25 18:08:47 +02:00 |
|
yflory
|
87dc528a99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-25 16:59:52 +02:00 |
|
yflory
|
6d8693ff8c
|
Fix history mode UI
|
2018-06-25 16:59: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 |
|
yflory
|
76bc82ac13
|
lint compliance
|
2018-06-25 13:42:17 +02:00 |
|
yflory
|
0160ef30b7
|
Fix pad password change
|
2018-06-25 12:08:06 +02:00 |
|
yflory
|
9b6895b47a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-25 11:13:08 +02:00 |
|
yflory
|
355dc5c993
|
Hide account password change form in settings
|
2018-06-25 11:13:02 +02:00 |
|
ansuz
|
4e9baff0b6
|
bump version
|
2018-06-25 11:00:59 +02:00 |
|
yflory
|
fbe940c024
|
Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge)
|
2018-06-22 19:43:07 +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 |
|
yflory
|
5c87bcf94a
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
2018-06-22 10:39:35 +02:00 |
|
yflory
|
a146f6acc9
|
Change user account password function
|
2018-06-22 10:37:54 +02:00 |
|
ansuz
|
a037f46b62
|
Merge branch 'staging' into modern-users
|
2018-06-22 10:28:11 +02:00 |
|
yflory
|
52cc007431
|
Merge branch 'master' into staging
|
2018-06-21 16:56:44 +02:00 |
|
yflory
|
ddcbd000dc
|
Bump chainpad-server version
|
2018-06-21 16:55:54 +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 |
|
yflory
|
ad0663c168
|
:q
|
2018-06-21 16:48:09 +02:00 |
|
yflory
|
29aca1da02
|
Bump listmap version
|
2018-06-21 14:36:38 +02:00 |
|
yflory
|
30beec0102
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-21 14:08:18 +02:00 |
|
yflory
|
d9c186a3da
|
Merge branch 'staging' into socketio
|
2018-06-21 14:01:56 +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 |
|
yflory
|
36d1ae0f6c
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
2018-06-20 16:39:52 +02:00 |
|
yflory
|
71b085ba23
|
Owned drive migration UI
|
2018-06-20 16:39:01 +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 |