Commit Graph

2060 Commits (8aed5c84688a69d5e60d53a02aaaf8e29871a2eb)

Author SHA1 Message Date
yflory bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
yflory 2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory 8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
Caleb James DeLisle 5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
yflory ef73cf89cd Merge branch 'soon' into staging 2018-07-18 15:10:23 +02:00
yflory 8eccffd8e4 Don't remove migrated read-only pads 2018-07-18 14:56:49 +02:00
yflory 64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory ebfa2c2dc3 Merge branch 'less-less' into staging 2018-07-18 14:18:37 +02:00
yflory aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
Caleb James DeLisle 8d95efa144 Reference the relevant line in alertify.js 2018-07-18 13:22:27 +02:00
Caleb James DeLisle a57a8e51a1 Prevent alertify.js from overriding styles 2018-07-18 13:20:16 +02:00
ansuz e110f20397 support blocks on remote domains 2018-07-17 17:41:30 +02:00
yflory e59aec0a45 Try...catch on testworker.js 2018-07-17 16:46:24 +02:00
yflory 08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
ansuz 1629d7bb1d provide a SANE default in case httpUnsafeOrigin is not provided 2018-07-17 16:31:15 +02:00
ansuz bcbec0144c provide a default in case httpUnsafeOrigin is not provided 2018-07-17 16:20:40 +02:00
yflory 6143bceabb Fix XXX 2018-07-17 15:38:23 +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 c9ac3c7c2b Fix search in shared folders 2018-07-17 11:22:01 +02:00
yflory fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
ansuz 2c22232a47 check if a user is logged in strictly by User_hash 2018-07-16 15:45:45 +02:00
ansuz 848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
yflory 5b48eff78c Remove owned pads deleted from the server in shared folders 2018-07-16 14:05:36 +02:00
ansuz b9c4aa43b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 11:25:11 +02:00
ansuz 3d95e6088a leave a FIXME note 2018-07-16 11:24:58 +02:00
Caleb James DeLisle 792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle 6c49318ac7 Show how long it takes to parse less 2018-07-14 15:19:39 +02:00
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
yflory b5c2eb8a9c Automatically refresh the drive when a change occurs in a shared folder 2018-07-13 19:24:49 +02:00
yflory 4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
yflory 6a80f49fe0 Don't load expired or deleted shared folders 2018-07-13 14:47:53 +02:00
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
Caleb James DeLisle 4a352f2ed8 Use import (reference) whenever the less file supposedly emits no CSS 2018-07-12 18:43:17 +02:00
yflory 7d89026d83 Fix more issues with shared folders 2018-07-12 17:27:16 +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
yflory 8516587ece lint compliance 2018-07-11 15:28:34 +02:00
yflory 9787f5304a Don't unpin channels that are still in another proxy 2018-07-11 15:28:24 +02:00
yflory 321c7d5512 Move pin/unpin outside of userObject 2018-07-10 18:23:16 +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 66a494cbd2 temp 2018-07-10 15:10:07 +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 bc7524c134 Fix tippy 2018-07-10 10:39:21 +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 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
yflory 0c9dfc1fb5 Add proxy manager inner 2018-07-05 16:33:46 +02:00
yflory bd6a199dca Add missing functions to the proxy manager 2018-07-05 13:56:16 +02:00
yflory a25a72b5db Add a proxy manager to handle operations between shared folders 2018-07-05 10:37:06 +02:00
yflory 66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +02:00
ansuz a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
yflory a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory af5cc30381 Fix undefined function when calling error() in the drive 2018-07-02 11:02:43 +02:00
yflory 071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory 27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
yflory 425ac8ea57 Migration for read-only links + fix issues with read-only pads 2018-06-29 18:16:04 +02:00
yflory 0f9a71686e Add support for read-only href stored in filesData 2018-06-28 18:16:38 +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 cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
yflory 554b4a978d Load shared folders in the store 2018-06-28 14:15: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
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
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 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 6fde027a6c add some TODOs 2018-06-21 10:26:46 +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 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