Commit graph

707 commits

Author SHA1 Message Date
yflory
a530776ba8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-30 15:54:34 +02:00
yflory
44edbf8b39 Remove some XXX 2019-09-27 16:03:06 +02:00
ansuz
6425d492f1 move credential.js from customize.dist/ to www/common/ 2019-09-27 12:04:31 +02:00
yflory
5ad5e32ec8 Change pad password with a team owner 2019-09-26 11:19:16 +02:00
yflory
b1dab8e75a Add team usage bar 2019-09-23 15:45:24 +02:00
yflory
0276858645 Fix owned upload files as a team 2019-09-19 14:43:21 +02:00
yflory
0d3f9db184 Improve sharing between drive and teams 2019-09-18 16:02:58 +02:00
yflory
08b105bc10 Remove dead code 2019-09-16 17:27:52 +02:00
yflory
450c920b84 Don't try to get files metadata 2019-09-13 17:25:51 +02:00
yflory
b76cef9660 Store a pad in a team drive 2019-09-13 16:45:07 +02:00
yflory
306fc6cdb9 Create and store pads in a team 2019-09-12 17:54:50 +02:00
yflory
798296489a Merge branch 'staging' into team 2019-09-10 15:32:05 +02:00
ansuz
26faf72df8 make it easier to filter clientside logs 2019-09-09 17:23:35 +02:00
yflory
dbe63f254a Merge branch 'staging' into team 2019-09-09 15:39:28 +02:00
yflory
ed2ae72c11 lint compliance 2019-09-09 14:53:37 +02:00
yflory
84249a92b5 Keep only one getPadMetadata in outer 2019-09-09 14:47:57 +02:00
yflory
bb0365622b re-encrypt the mailbox field when changing a pad password 2019-09-09 14:13:27 +02:00
yflory
15387af020 Merge branch 'staging' into team 2019-09-06 15:46:19 +02:00
yflory
834e12fcba Teams: async-store refactoring 2019-09-06 15:45:56 +02:00
yflory
4c339afc6c Refactoring part2 2019-09-05 17:55:23 +02:00
yflory
7222d34dc0 Refactor async-store to make it work with teams 2019-09-05 13:56:47 +02:00
ansuz
096b0fb44a move 'getDefaultName' out of 'common-hash' 2019-09-05 12:22:30 +02:00
yflory
c5903ffb9d Add XXX 2019-09-03 18:42:31 +02:00
yflory
32f1d1627f Refresh properties modal when receiving metadata updates 2019-09-03 13:30:35 +02:00
yflory
9822c28f3b Implement ADD_OWNER notification with pending_owner metadata 2019-08-30 16:41:48 +02:00
yflory
2a91643d59 Remove an owner 2019-08-28 16:37:13 +02:00
yflory
7bd4a4028b Fix fileHost again... 2019-08-27 15:31:22 +02:00
yflory
24ea640397 Kill the testworker to save memory usage 2019-08-20 13:55:37 +02:00
yflory
c1656d7b5b Merge branch 'unifiedMetadata' into staging 2019-08-19 15:27:59 +02:00
ansuz
5dacc6ceeb Merge branch 'soon' into staging 2019-08-16 17:39:54 +02:00
ansuz
bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
ClemDee
4f84a928a9 Small fixes and improvements 2019-08-13 18:05:03 +02:00
ClemDee
f55c8c6b04 Open plain text files in code app && plain text files thumbnail 2019-08-13 16:09:06 +02:00
yflory
21658e9de1 Fix restoring an older version of the drive 2019-08-12 15:52:48 +02:00
yflory
3303e9738d Fix drive deletion 2019-08-12 15:38:21 +02:00
yflory
5c6b3155ac Add safety measures to avoid removing your drive by accident 2019-08-12 15:30:59 +02:00
yflory
51facff6fd Send a mailbox address (encrypted) to the owned pads metadata 2019-07-17 17:01:25 +02:00
yflory
60bea6b33b Request capabilities part 2 2019-07-13 11:47:58 +02:00
yflory
6f1e281cf8 request capabilities temp 2019-07-11 14:16:04 +02:00
yflory
93b4dac8bb Support mailbox in the support and admin apps 2019-06-27 17:08:23 +02:00
yflory
04d8578f4e Shared folder history 2019-06-17 14:13:06 +02:00
yflory
2e96f13d0c lint compliance 2019-05-27 17:52:49 +02:00
yflory
28c8834fa4 Remove the 'enablePinning' config property 2019-05-27 15:29:36 +02:00
yflory
df7a2f35fb Profile refactoring with friend request 2019-05-24 17:45:03 +02:00
yflory
7666a008d7 Merge branch 'mailbox' into staging 2019-05-23 15:49:18 +02:00
yflory
991c56fec3 Friend requests with mailboxes 2019-05-21 18:43:11 +02:00
yflory
1802656d9c Fix templates in poll part 2 #375 2019-05-21 11:05:30 +02:00
yflory
3be85b155d Fix issues with templates in polls #375 2019-05-20 17:18:02 +02:00
yflory
3feb310fc4 Add mailbox inner channel 2019-05-15 14:52:58 +02:00
yflory
ad3ee14d2b Fix Clean CryptDrive button in settings 2019-04-23 13:35:05 +02:00