Commit Graph

383 Commits (2b2c6bcf2ee42dba44c563d481d4f7cdb0e94a44)

Author SHA1 Message Date
yflory 1e1d24c6c3 Merge branch 'staging' into team 2019-09-19 13:47:43 +02:00
ansuz 047d64a3c2 clone objects passed to roster commands to avoid mutating the passed value 2019-09-19 13:44:48 +02:00
yflory 30d9cf31c3 Display roster in the team app 2019-09-19 13:30:31 +02:00
ansuz ce5c841a42 implement auto-checkpoint logic 2019-09-19 09:18:07 +02:00
yflory 3d96f3d7b1 lint compliance 2019-09-18 18:01:37 +02:00
yflory 1b9a8828e9 Update team name and add an avatar to the team 2019-09-18 18:00:44 +02:00
yflory bd8df41fde Merge branch 'staging' into team 2019-09-18 16:32:35 +02:00
ansuz 7230ee71a8 fix json.sortify in browser contexts. lint compliance 2019-09-18 16:31:23 +02:00
ansuz 4269cb1ec7 fixed a few roster bugs 2019-09-18 16:27:01 +02:00
yflory 84833afcfa Merge branch 'staging' into team 2019-09-18 16:16:46 +02:00
yflory 0d3f9db184 Improve sharing between drive and teams 2019-09-18 16:02:58 +02:00
ansuz 073543fe3d more WIP for roster 2019-09-18 15:04:08 +02:00
yflory fc2938a27e Fix back button in teams with messenger and drive 2019-09-18 13:30:24 +02:00
yflory 5e58f7db4c Merge branch 'staging' into team 2019-09-17 18:50:14 +02:00
ansuz 5c984854c7 WIP 2019-09-17 18:49:49 +02:00
yflory 9cbe9dbf50 Load the team roster 2019-09-17 18:49:19 +02:00
yflory fa89ab410d Revert previous commit and make the team pin everything 2019-09-17 16:54:09 +02:00
yflory 02cd15882b Fix reset pin with teams 2019-09-17 16:33:13 +02:00
yflory 74d7c00134 Store team chat keys in the user proxy 2019-09-17 16:24:48 +02:00
yflory a7c274e6ae Merge branch 'staging' into team 2019-09-17 11:34:03 +02:00
yflory fb22a4a792 Merge branch 'chat3' into team 2019-09-17 11:33:26 +02:00
ansuz be8b014b36 WIP roster implementation 2019-09-17 11:28:22 +02:00
yflory b58b6fa691 Fix back button in teams 2019-09-17 11:09:40 +02:00
yflory 81c2df389a Team chat 2019-09-17 11:05:32 +02:00
yflory 08b105bc10 Remove dead code 2019-09-16 17:27:52 +02:00
yflory 641b69446d Fix issues and replace chat module 2019-09-16 16:48:32 +02:00
yflory c6a4f78097 Chat V3 2019-09-16 15:56:50 +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 7f0dd4f576 Load shared folder and register change events in teams 2019-09-11 18:01:48 +02:00
yflory fa2d148df4 Display a team drive 2019-09-11 16:24:04 +02:00
ansuz c17a28cced WIP roster definition 2019-09-11 15:41:50 +02:00
yflory 222ea650d1 lint compliance 2019-09-10 18:37:11 +02:00
yflory 1b31d8f7c6 Create a team 2019-09-10 18:32:12 +02:00
yflory 798296489a Merge branch 'staging' into team 2019-09-10 15:32:05 +02:00
yflory 7e238245e6 Fix pad not stored in drive when accepting ownership 2019-09-10 15:30:36 +02:00
ansuz 532ba9b9fd update XXX comments which are no longer valid or can wait 2019-09-10 10:29:08 +02:00
yflory 2bd8c2d363 Fix onreconnect in cursor 2019-09-09 18:56:49 +02:00
yflory 29075b7898 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-09 18:47:46 +02:00
yflory c19ff5958c Fix duplicate join in cursor.js 2019-09-09 18:47:34 +02:00
ansuz 9f9bce7ac5 create the 'what is cryptpad' pad as owned when you register 2019-09-09 18:12:05 +02:00
yflory b84c4be69c Display OS notifications when receiving a notification on CryptPad 2019-09-09 17:37:11 +02:00
yflory dbe63f254a Merge branch 'staging' into team 2019-09-09 15:39:28 +02:00
yflory d993827c7e Fix expiration time not updated properly on accept ownership 2019-09-09 15:31:59 +02:00
yflory 5e5d1ecddb Update local metadata when fetching latest values from the server 2019-09-09 14:59:40 +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 0a5bf7a5c2 Update atime when updating the owners of a pad 2019-09-09 12:19:29 +02:00
yflory 634d24b46c Team APP UI 2019-09-06 18:47:18 +02:00
yflory 15387af020 Merge branch 'staging' into team 2019-09-06 15:46:19 +02:00