Commit graph

680 commits

Author SHA1 Message Date
yflory
7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory
256b7b5bb4 Phantom viewers potential fix 2018-08-28 16:28:32 +02:00
yflory
e8a5244362 Autostore base 2018-08-27 14:58:09 +02:00
yflory
d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
yflory
64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory
aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
yflory
e59aec0a45 Try...catch on testworker.js 2018-07-17 16:46:24 +02:00
ansuz
a2fd32d6a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-17 14:49:19 +02:00
ansuz
e6d4bced18 clean up extraneous variables and log statements 2018-07-17 14:34:25 +02:00
yflory
ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
yflory
fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
ansuz
848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
yflory
4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
Caleb James DeLisle
c5105d7b84 Merge branch 'check-for-css-variables' into staging 2018-07-12 17:16:21 +02:00
Caleb James DeLisle
a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
Caleb James DeLisle
cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle
fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
ansuz
8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
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
yflory
4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz
0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
yflory
6312dadb60 Fix shared folders names in the drive 2018-07-09 18:11:04 +02:00
yflory
e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +02:00
ansuz
a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +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
yflory
34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory
a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
yflory
470f404a24 temp 2018-06-28 15:31:30 +02:00
ansuz
7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
yflory
6dc7e7eff4 Disable WebWorkers by default 2018-06-26 14:15:25 +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
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
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
yflory
a146f6acc9 Change user account password function 2018-06-22 10:37:54 +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
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
yflory
c802b761c7 Fix pads not stored in the correct folder the first time 2018-06-19 11:04:39 +02:00
yflory
d37aa0646e Change account password (clientside RPC) 2018-06-14 18:18:53 +02:00
yflory
54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
yflory
4896fe81fe Merge branch 'serviceworker' into staging 2018-06-12 18:24:19 +02:00
yflory
1b49020753 Add support for async store when WebWorker is not available 2018-06-12 18:20:48 +02:00
yflory
9fbf507cda Fix new version detection 2018-06-12 14:23:54 +02:00
yflory
089e0361b6 Detect new version 2018-06-11 16:52:26 +02:00
yflory
996245ec3d Merge branch 'staging' into serviceworker 2018-06-11 10:17:50 +02:00
yflory
47dee664da Add support for login & logout while keeping the same shared worker 2018-06-08 17:35:44 +02:00
yflory
02b282a1a5 Disconnect from shared/service worker 2018-06-08 16:45:07 +02:00
yflory
f05e2225d6 lint compliance 2018-06-06 18:22:48 +02:00
yflory
78ff55e34e Fix race condition 2018-06-06 18:21:52 +02:00
yflory
48dc8c78b4 Fix cache and merge issues 2018-06-06 18:10:58 +02:00
yflory
14db9fad8e Merge branch 'echidna' into serviceworker 2018-06-06 17:54:07 +02:00
yflory
598d56c75e Fix cache issues 2018-06-06 17:45:43 +02:00
yflory
cefe19b0e1 Merge branch 'echidna' into serviceworker 2018-06-06 17:25:24 +02:00
yflory
953d98be96 Fix reconnect 2018-06-06 17:25:06 +02:00
yflory
6ab29f8f3a Test service worker and shared worker store 2018-06-06 15:58:43 +02:00
yflory
3f8b6d3b8a Fix default title issues when using a template 2018-06-04 16:02:58 +02:00
yflory
b9f5a0f52b Move async store in a webworker! 2018-05-31 18:22:16 +02:00
yflory
85e5c495d9 Remove owned file 2018-05-30 14:36:29 +02:00
yflory
93ecc06964 Upload owned files 2018-05-29 19:42:20 +02:00
yflory
586193d6a1 Password-protected files: upload files with hashes V2 2018-05-28 15:31:18 +02:00
yflory
c7e08fedfb Password-protected files 2018-05-25 18:00:10 +02:00
yflory
914da83b46 Fix missing edit hash in share modal when opening a pad in read-only mode 2018-05-23 16:55:23 +02:00
ansuz
bd66c8fee8 hacks to handle weird entries in drive 2018-05-18 10:28:31 +02:00
yflory
ef735d6fe6 Fix an issue when trying to create a pad with a password from a template 2018-05-17 18:15:10 +02:00
yflory
2d2701596a Loading message and loading bar for migration 2018-05-04 18:41:54 +02:00
yflory
64c85fe548 Don't return channel in parsePadUrl 2018-04-27 17:23:23 +02:00
yflory
43d046406f Store the channel id as pad attribute 2018-04-27 11:54:23 +02:00
yflory
b26ae67df5 Fix issues with channel ID when using a password 2018-04-26 15:10:31 +02:00
yflory
1879c1829c Add passwod prompt to access protected pads 2018-04-25 19:03:58 +02:00
yflory
811463b870 Add support for version 2 hashes needed for password-protected pads 2018-04-24 17:22:33 +02:00
yflory
ec0fc85b9f Sort templates by usage in the PCS 2018-04-13 18:52:55 +02:00
yflory
a718603b36 Automatic account deletion 2018-03-21 18:27:20 +01:00
yflory
07e361b88d Account deletion button 2018-03-19 14:04:44 +01:00
yflory
c9ed6d6bf8 New pad creation screen 2018-03-13 11:31:08 +01:00
yflory
728a6a868d Manage expired channels 2018-02-13 18:20:13 +01:00
yflory
bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory
36550b781f Don't check for stronger hash if we have an edit hash 2018-01-26 15:44:38 +01:00
yflory
9a317018e2 Remove deleted pads from the drive 2018-01-25 17:54:21 +01:00
yflory
c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
yflory
0f02d76b56 Fix missing callback when uploading files to the drive 2018-01-03 15:08:26 +01:00
ansuz
869909b101 implement more reliable check for whether a channel on the server is new 2017-12-22 16:24:17 +01:00
ansuz
892dfb18f7 check if users have service workers 2017-12-21 17:30:54 +01:00
yflory
09433e0bf0 display existing tags in the prompt in drive 2017-12-19 10:16:53 +01:00
yflory
c18d4297e1 Fix friend requests from the userlist 2017-12-15 16:19:22 +01:00
ansuz
76af3b90a7 stub createUnpinnedWarning0 2017-12-12 13:47:24 +01:00
yflory
e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
yflory
e72270d4a4 Add feedback when sharedworker is defined 2017-12-07 10:50:45 +01:00
yflory
1ac4abc482 Remove old code 2017-12-07 10:35:48 +01:00
yflory
64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
yflory
3e064e6638 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-06 18:33:16 +01:00