Commit Graph

174 Commits (4b54bd220aa6a7beba9c43146f2c5d0f15536f9b)

Author SHA1 Message Date
yflory f3dd85a7af Fix infinite loading screen 2019-06-20 10:54:15 +02:00
yflory 2c661310c7 Merge branch 'staging' into foldersColor 2019-06-18 15:36:22 +02:00
yflory 1f5eb66fe0 Merge branch 'soon' into staging 2019-06-18 11:27:57 +02:00
yflory eaa389fcb8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 11:10:56 +02:00
yflory 07775d6e13 Use shared folders events to pin and unpin pads 2019-06-18 11:10:46 +02:00
ClemDee e9598de655 Add folder metadata and folder color 2019-06-18 10:44:27 +02:00
yflory 04d8578f4e Shared folder history 2019-06-17 14:13:06 +02:00
ansuz 7b8ac3d8c8 Merge branch 'soon' into staging 2019-06-14 10:45:25 +02:00
yflory 3e4ee75137 Fix race condition with pins 2019-06-14 10:03:52 +02:00
yflory db84b41225 Merge branch 'shareModal' into staging 2019-06-07 11:16:41 +02:00
yflory ae9caecc52 fix race condition 2 2019-06-06 15:40:08 +02:00
yflory 62c96d562f Fix race condition with nthen 2019-06-06 15:33:08 +02:00
yflory 9b5104c59e Update the friends when changing the username or avatar 2019-06-05 18:23:15 +02:00
yflory 6de97cac14 Migrate friends 2019-06-04 18:44:55 +02:00
yflory d317053db4 Increase tab/worker timeout value 2019-05-28 14:14:09 +02:00
yflory 5512d1fab7 Remove test code 2019-05-27 17:55:28 +02:00
yflory c3e9b51f76 Realtime update of the friendship status in the profile 2019-05-27 17:51:55 +02:00
yflory 61161c034c Fix profile not updating the user name 2019-05-27 15:45:26 +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 4240d1c0d5 Fix empty username when declining a friend request 2019-05-23 16:02:21 +02:00
yflory 7666a008d7 Merge branch 'mailbox' into staging 2019-05-23 15:49:18 +02:00
yflory 19a91f11c6 Never dismiss friend requests 2019-05-23 15:33:23 +02:00
yflory 06a07d069e Decline a friend request 2019-05-23 15:25:23 +02:00
yflory 9cb1a059f2 Improve friend request process and UI 2019-05-22 18:03:52 +02:00
yflory 38f8535dd5 Add the mailboxes channels to the pin list 2019-05-22 15:38:27 +02:00
yflory 991c56fec3 Friend requests with mailboxes 2019-05-21 18:43:11 +02:00
yflory 3be85b155d Fix issues with templates in polls #375 2019-05-20 17:18:02 +02:00
yflory 7fd3bba2a6 Test sending a message from a pad (inner iframe) 2019-05-17 17:42:33 +02:00
yflory 9ead40a332 Test sending a message to a friend 2019-05-17 17:23:21 +02:00
yflory 2168557124 Merge branch 'cpnetflux' into staging 2019-05-16 16:11:32 +02:00
yflory d3af840f81 Merge branch 'cpnetflux' into mailbox 2019-05-16 15:58:35 +02:00
yflory 909e70905c Add comment 2019-05-16 15:20:50 +02:00
yflory 827a47d9b7 Fix issue when reconnecting to a pad 2019-05-16 14:11:31 +02:00
yflory ce2d0d5b83 Mailbox and notifications prototype 2019-05-15 18:22:39 +02:00
yflory 11b57cddb1 Merge branch 'cpnetflux' into staging 2019-05-15 14:52:28 +02:00
yflory c61617411a Add mailbox module 2019-05-15 14:49:35 +02:00
yflory c4ac858f5d Remove chainpad-netflux-outer 2019-04-26 15:17:20 +02:00
yflory ad3ee14d2b Fix Clean CryptDrive button in settings 2019-04-23 13:35:05 +02:00
yflory f4bf032513 Fix one case of duplicated content #352 2019-04-18 15:15:07 +02:00
yflory 9b9cedd191 Fix userlist and chat after reconnection in a shared worker 2019-04-16 12:09:39 +02:00
yflory 52dbc296ee Detect phantom tabs using PING in the worker 2019-04-15 14:21:04 +02:00
yflory bb5f03bd0f Add admin panel 2019-03-27 17:00:28 +01:00
yflory 42055c32b5 Fix undefined settings when creating a new account 2019-03-05 11:50:02 +01:00
yflory f04ba4a3d8 Too many false positive with the timeout detection 2019-02-05 16:17:54 +01:00
yflory cb89a5fdfe Test timeout to kill phantom viewers 2019-01-30 15:50:37 +01:00
yflory ed4f8016a1 Merge branch 'staging' into locks 2019-01-24 16:27:15 +01:00
yflory 7d0f34a684 Debugging tools 2019-01-21 16:54:15 +01:00
yflory a66d8c1384 Use lastKnownHash to handle checkpoints in the realtime channel 2019-01-18 18:17:34 +01:00
yflory 8dbeee1af9 Realtime spreadsheets 2019-01-15 17:54:44 +01:00