5144 Commits

Author SHA1 Message Date
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
yflory
a5b207d57b Password change UI 2018-06-20 10:02:56 +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
yflory
7948fe2b70 Merge branch 'soon' into staging 2018-06-19 17:02:26 +02:00
yflory
29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +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
yflory
c802b761c7 Fix pads not stored in the correct folder the first time 2018-06-19 11:04:39 +02:00
yflory
60db53a993 Use framework in the whiteboard app 2018-06-18 12:14:16 +02:00
yflory
d37aa0646e Change account password (clientside RPC) 2018-06-14 18:18:53 +02:00
yflory
b89b033175 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-14 17:18:56 +02:00
yflory
54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
ansuz
2463dd0c9e Merge branch 'soon' into staging 2018-06-13 13:52:58 +02:00
ansuz
9f9664eba1
Merge pull request #247 from CatalinScr/master
Repaired some responsive issues on about page, contact and features
2018-06-13 13:52:17 +02:00
Catalin
e9e461c4d6 Repaired some responsive issues on about page, contact and features 2018-06-13 11:12:56 +03:00
yflory
d1e8baca68 Lint compliance 2018-06-12 18:26:21 +02:00
yflory
4896fe81fe Merge branch 'serviceworker' into staging 2018-06-12 18:24:19 +02:00