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 |
|
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
|
250d9f3bc6
|
Fix friend migration and handle UPDATE_DATA mails
|
2019-06-05 16:05:00 +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
|
cc44fe846a
|
Update userlist when receiving unfriend
|
2019-05-28 10:56:13 +02:00 |
|
yflory
|
9d8433d104
|
Unfriend via mailbox
|
2019-05-27 18:58:35 +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
|
6370c0eeae
|
Update the profile page when receiving a answer for a friend request
|
2019-05-27 16:03:10 +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
|
bf0fd64a70
|
lint compliance
|
2019-05-27 15:07:11 +02:00 |
|
yflory
|
ccff67cf42
|
Fix missing name in notifications
|
2019-05-27 15:06:30 +02:00 |
|
yflory
|
727470d9ed
|
Add missing file
|
2019-05-27 14:59:08 +02:00 |
|
yflory
|
6404e5c430
|
Fix duplicate notications
|
2019-05-27 14:03:15 +02:00 |
|
yflory
|
8dd557a0f6
|
Remove the ACCEPT or DECLINE friend request messages instantly
|
2019-05-27 11:18:53 +02:00 |
|
yflory
|
df7a2f35fb
|
Profile refactoring with friend request
|
2019-05-24 17:45:03 +02:00 |
|
yflory
|
64b0a8c5e3
|
Re-join the mailboxes channels when reconnecting
|
2019-05-24 10:29:42 +02:00 |
|
yflory
|
e1b8d0bc6c
|
Fix friend request issue
|
2019-05-23 16:13:51 +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
|
0732773bba
|
lint compliance
|
2019-05-17 18:28:45 +02:00 |
|
yflory
|
11a365557c
|
Clear notifications viewed from another store (browser/worker)
|
2019-05-17 18:28:15 +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
|
b15c67e8d4
|
Enable encryption in mailboxes and post to other users
|
2019-05-17 16:55:56 +02:00 |
|
yflory
|
62e128a9fe
|
Store and display new notifications
|
2019-05-17 16:19:41 +02:00 |
|
yflory
|
c9f1a69a2e
|
Merge branch 'staging' into mailbox
|
2019-05-16 16:15:28 +02:00 |
|
yflory
|
de3bb5cdcf
|
Ignore jshint on mailbox placeholder
|
2019-05-16 16:14:25 +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
|
3feb310fc4
|
Add mailbox inner channel
|
2019-05-15 14:52:58 +02:00 |