Commit Graph
100 Commits
Author SHA1 Message Date
yflory acae946528 Merge branch 'soon' into staging 2019-09-24 15:13:58 +02:00
yflory 5e80efda58 Fix val is undefined 2019-09-24 14:48:52 +02:00
yflory 967cbc204d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-24 11:59:13 +02:00
yflory 5f188a2fc4 Move team to teams 2019-09-24 11:58:57 +02:00
yflory b41fd12deb Teams... 2019-09-24 11:49:11 +02:00
yflory 67c8db8b99 Fix share with team 2019-09-24 11:04:13 +02:00
yflory d90115fbc9 Add translation keys and remove/fix XXX 2019-09-24 10:52:03 +02:00
yflory b3041bd59a Store latest metadata when loading a team 2019-09-23 17:56:16 +02:00
yflory 851f6db7fb Fix type error in messenger 2019-09-23 17:52:15 +02:00
yflory 9f597dac1f Fix drive displaying All Files after logging in 2019-09-23 17:25:21 +02:00
yflory 0de7395258 Fix metadata not updated when creating a team 2019-09-23 17:01:30 +02:00
yflory b1dab8e75a Add team usage bar 2019-09-23 15:45:24 +02:00
yflory 17fbaea5d0 Disable Polish language 2019-09-23 15:15:53 +02:00
yflory 5caa09ce84 Remove unused file 2019-09-23 14:51:34 +02:00
yflory 83bc0d84f0 Add comments and XXX 2019-09-23 14:35:57 +02:00
yflory 4128c34b93 Fix messenger issues 2019-09-23 14:35:43 +02:00
yflory f27451e51c Fix leave team error 2019-09-23 12:10:46 +02:00
yflory 9e43e8226f Merge branch 'staging' into team 2019-09-23 11:53:50 +02:00
yflory b6c5403050 Hide the team app behind a flag 2019-09-23 11:52:49 +02:00
yflory 97efaf2417 Update roster last known hash 2019-09-23 11:38:57 +02:00
yflory 78022fa527 Merge branch 'staging' into team 2019-09-23 11:35:20 +02:00
yflory 4381ff8107 Leave a team 2019-09-23 11:34:57 +02:00
yflory adac70567f Roster page UI 2019-09-23 11:16:03 +02:00
yflory 9e7dfed98b Update roster checkpoints hash 2019-09-23 11:04:05 +02:00
yflory 1a9229e0ec Notify the other user when we kick them from a team 2019-09-23 10:51:46 +02:00
yflory 977198122f Fix set team metadata using wrong data 2019-09-23 10:51:35 +02:00
yflory 45d37acc84 lint compliance 2019-09-20 17:29:21 +02:00
yflory 5d18dcc8ba Realtime updates when the roster changes 2019-09-20 17:27:15 +02:00
yflory 3cc8b5eb83 Fix roster.stop fix 2019-09-20 16:49:38 +02:00
yflory 5b006a8819 Fix roster.stop 2019-09-20 16:38:04 +02:00
yflory e4e2c3a19d Team invitation 2019-09-20 15:27:20 +02:00
yflory 3a76e84286 Add new modal type 2019-09-20 15:26:58 +02:00
yflory 0276858645 Fix owned upload files as a team 2019-09-19 14:43:21 +02:00
yflory 482460e286 lint compliance 2019-09-19 14:18:09 +02:00
yflory 2b2c6bcf2e Handle multiple file uploaders on the same page 2019-09-19 14:17:07 +02:00
yflory 3ca2ac5e76 Merge branch 'staging' into team 2019-09-19 13:56:13 +02:00
yflory 1e1d24c6c3 Merge branch 'staging' into team 2019-09-19 13:47:43 +02:00
yflory 30d9cf31c3 Display roster in the team app 2019-09-19 13:30:31 +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
yflory 82b1d975ed Display correct owner in the team drive 2019-09-18 16:32:14 +02:00
yflory 84833afcfa Merge branch 'staging' into team 2019-09-18 16:16:46 +02:00
yflory 1029ca0a8e Share modal UI 2019-09-18 16:15:45 +02:00
yflory 0d3f9db184 Improve sharing between drive and teams 2019-09-18 16:02:58 +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
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 9cf99a8b65 Remove more handlers when closing the drive 2019-09-17 11:57:30 +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
yflory f17cdcda9f Ability to remove window handlers added from the drive 2019-09-17 11:33:09 +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 1639cf780d Merge branch 'team' into chat3 2019-09-16 16:49:34 +02:00
yflory 938a42aae8 lint compliance 2019-09-16 16:49:21 +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 450c920b84 Don't try to get files metadata 2019-09-13 17:25:51 +02:00
yflory 799d93eb48 Prevent sharing a pad with a team from this team's drive 2019-09-13 16:55:48 +02:00
yflory b76cef9660 Store a pad in a team drive 2019-09-13 16:45:07 +02:00
yflory be85efcb21 Fix decodeBase64 error with thumbnails 2019-09-13 15:44:35 +02:00
yflory 489bec6285 Use console.debug in userObject 2019-09-13 15:34:33 +02:00
yflory 353da76808 Improve share modal UI 2019-09-12 18:51:03 +02:00
yflory 306fc6cdb9 Create and store pads in a team 2019-09-12 17:54:50 +02:00
yflory 79ac44de7e Fix team drive toolbar ui 2019-09-12 14:06:35 +02:00
yflory 6c70bf62b1 Don't pull the entire css twice 2019-09-12 14:04:57 +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
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
yflory 16549f40bb Add a way to restore broken spreadsheets 2019-09-10 14:02:29 +02:00
yflory f5444e5d3d Add notification icon 2019-09-10 13:13:08 +02:00
yflory 39eefec50a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-10 11:23:10 +02:00
yflory fc3c487421 Disable transfer ownership for shared folders and files 2019-09-10 11:23:00 +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
yflory 8c8f7e4605 Fix 'document' not defined in the worker context 2019-09-09 18:11:27 +02:00
yflory e7f56ca236 lint compliance... 2019-09-09 18:10:20 +02:00
yflory d92122347f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-09 17:43:04 +02:00
yflory b84c4be69c Display OS notifications when receiving a notification on CryptPad 2019-09-09 17:37:11 +02:00
yflory 2d7f7b895d Fix team inner.js 2019-09-09 16:30:28 +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 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 0a5bf7a5c2 Update atime when updating the owners of a pad 2019-09-09 12:19:29 +02:00
yflory f8bc5343d5 Improve french translation 2019-09-09 12:18:57 +02:00
yflory f60e7ffd19 Transfer ownership UI 2019-09-09 11:02:08 +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