 yflory
|
9a04f748b5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-19 16:31:16 +02:00 |
|
|
yflory
|
6dd8615cab
|
New icon
|
2019-06-19 16:31:05 +02:00 |
|
|
yflory
|
46ed3e5e98
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-18 17:25:23 +02:00 |
|
|
yflory
|
c9b139313b
|
Make drive drag&select more responsive
|
2019-06-18 17:22:19 +02:00 |
|
|
yflory
|
2c661310c7
|
Merge branch 'staging' into foldersColor
|
2019-06-18 15:36:22 +02:00 |
|
|
yflory
|
7c15076300
|
Merge branch 'staging' into cryptDriveTree
|
2019-06-18 14:34:22 +02:00 |
|
|
yflory
|
b0ef3d6021
|
Fix UI issues with the new share modal and notifications
|
2019-06-18 14:23:48 +02:00 |
|
|
yflory
|
a43fc5efef
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-18 12:06:32 +02:00 |
|
|
yflory
|
0df7cd67a9
|
Fix translation key
|
2019-06-18 12:06:17 +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 |
|
|
yflory
|
04d8578f4e
|
Shared folder history
|
2019-06-17 14:13:06 +02:00 |
|
|
yflory
|
ba877ba459
|
Display the channel ID of a shared folder to be able to restore it
|
2019-06-14 14:12:43 +02:00 |
|
|
yflory
|
3e4ee75137
|
Fix race condition with pins
|
2019-06-14 10:03:52 +02:00 |
|
|
yflory
|
fc9a438f27
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-13 11:18:10 +02:00 |
|
|
yflory
|
d903aed496
|
Add README for our custom icons font
|
2019-06-13 11:18:04 +02:00 |
|
|
yflory
|
dd7fc83867
|
Store the blob metadata the first time
|
2019-06-13 11:17:43 +02:00 |
|
|
yflory
|
89264758d2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-11 12:31:54 +02:00 |
|
|
yflory
|
be43aad04c
|
Add a palette icon to our custom font
|
2019-06-11 12:31:24 +02:00 |
|
|
yflory
|
02c765b085
|
lint compliance
|
2019-06-07 15:50:00 +02:00 |
|
|
yflory
|
73e068dacc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-07 15:48:44 +02:00 |
|
|
yflory
|
23e48a6b4f
|
Fix messenger unable to send messages
|
2019-06-07 13:44:52 +02:00 |
|
|
yflory
|
32a3ed6842
|
Make the clickable area to dismiss notifications bigger
|
2019-06-07 11:47:50 +02:00 |
|
|
yflory
|
e77207dfee
|
Merge remote-tracking branch 'origin/padsTheme' into staging
|
2019-06-07 11:23:26 +02:00 |
|
|
yflory
|
db84b41225
|
Merge branch 'shareModal' into staging
|
2019-06-07 11:16:41 +02:00 |
|
|
yflory
|
dab63c70c2
|
Merge branch 'cryptDriveTree' into staging
|
2019-06-07 11:15:35 +02:00 |
|
|
yflory
|
f37bc78eaf
|
Merge branch 'cryptDriveToolbar' into staging
|
2019-06-07 11:15:13 +02:00 |
|
|
yflory
|
473cbcd1b6
|
Fix drive toolbar new line bug
|
2019-06-07 11:13:46 +02:00 |
|
|
yflory
|
770af27b02
|
Merge branch 'cryptDriveToolbar' of github.com:xwiki-labs/cryptpad into cryptDriveToolbar
|
2019-06-07 11:05:32 +02:00 |
|
|
yflory
|
26ef1e5769
|
Fix infinite loop when trying to display an invalid category in the drive
|
2019-06-07 11:05:15 +02:00 |
|
|
yflory
|
60a8fb3932
|
Merge branch 'soon' into staging
|
2019-06-06 16:50:20 +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
|
b7b64a7c90
|
Disable friend migration while testing on alpha
|
2019-06-06 11:35:14 +02:00 |
|
|
yflory
|
b35be86145
|
Bump drive version after migration
|
2019-06-06 11:22:51 +02:00 |
|
|
yflory
|
2a1502a25e
|
lint compliance
|
2019-06-05 18:25:00 +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
|
592544819e
|
Fix unfriend bug
|
2019-06-05 15:32:32 +02:00 |
|
|
yflory
|
6de97cac14
|
Migrate friends
|
2019-06-04 18:44:55 +02:00 |
|
|
yflory
|
38c3ca9f54
|
Fix UI issues
|
2019-06-04 17:13:19 +02:00 |
|
|
yflory
|
5640d41b79
|
add missing file
|
2019-06-04 16:58:21 +02:00 |
|
|
yflory
|
a3a2c92c0c
|
Share a pad, a file or a folder with friends
|
2019-06-04 16:19:47 +02:00 |
|
|
yflory
|
c154d020b2
|
Share with friends from sframe and drive
|
2019-06-04 15:57:39 +02:00 |
|
|
yflory
|
41c3b38a11
|
lint compliance
|
2019-06-04 11:23:38 +02:00 |
|
|
yflory
|
39d2496330
|
Implement UI to share a pad with a friend
|
2019-06-04 11:22:38 +02:00 |
|
|
yflory
|
eb12178fe7
|
Notifications in the admin panel
|
2019-06-03 11:58:49 +02:00 |
|
|
yflory
|
8e7858e6ae
|
New share modal in all the apps
|
2019-06-03 11:57:55 +02:00 |
|
|
yflory
|
2513f33aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-06-03 11:31:19 +02:00 |
|
|
yflory
|
8f2596f722
|
Catalan translation
|
2019-06-03 11:31:12 +02:00 |
|
|
yflory
|
fb0827107b
|
Secure share modal
|
2019-05-29 19:00:20 +02:00 |
|
|
yflory
|
9aceb339ef
|
Update UI for pending friend request
|
2019-05-28 14:38:13 +02:00 |
|
|
yflory
|
8b200817ee
|
Fix translation issue with weblate pushing empty strings
|
2019-05-28 14:28:51 +02:00 |
|
|
yflory
|
d317053db4
|
Increase tab/worker timeout value
|
2019-05-28 14:14:09 +02:00 |
|
|
yflory
|
728c2716b4
|
Merge branch 'unfriend' into staging
|
2019-05-28 10:59:02 +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
|
9c4f9378ab
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-05-27 17:55:42 +02:00 |
|
|
yflory
|
5512d1fab7
|
Remove test code
|
2019-05-27 17:55:28 +02:00 |
|
|
yflory
|
2e96f13d0c
|
lint compliance
|
2019-05-27 17:52:49 +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
|
36aa07adab
|
Fix friend request from profile
|
2019-05-27 15:57:10 +02:00 |
|
|
yflory
|
61161c034c
|
Fix profile not updating the user name
|
2019-05-27 15:45:26 +02:00 |
|
|
yflory
|
8641eca34b
|
Fix bad translation key in profile
|
2019-05-27 15:33:40 +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
|
d514854724
|
Fix undefined name
|
2019-05-24 17:50:40 +02:00 |
|
|
yflory
|
6f520dae77
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-05-24 17:45:13 +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
|
ac5060d5dd
|
Fix incorrect message when declining a friend request
|
2019-05-24 10:29:00 +02:00 |
|
|
yflory
|
e1b8d0bc6c
|
Fix friend request issue
|
2019-05-23 16:13:51 +02:00 |
|
|
yflory
|
cb16a2e7e4
|
Notifications in the contacts app
|
2019-05-23 16:12:39 +02:00 |
|
|
yflory
|
5331eebb3e
|
Enable notifications everywhere
|
2019-05-23 16:09:04 +02:00 |
|
|
yflory
|
4240d1c0d5
|
Fix empty username when declining a friend request
|
2019-05-23 16:02:21 +02:00 |
|
|
yflory
|
caf36cb3bf
|
lint compliance
|
2019-05-23 15:51:50 +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
|
67e39253cf
|
Add translation keys
|
2019-05-23 15:12:59 +02:00 |
|
|
yflory
|
ed868f9c5d
|
Notifications UI
|
2019-05-23 11:34:56 +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
|
569c44bd90
|
Remove the 20 pads limits in recent pads
|
2019-05-21 11:16:41 +02:00 |
|
|
yflory
|
1802656d9c
|
Fix templates in poll part 2 #375
|
2019-05-21 11:05:30 +02:00 |
|
|
yflory
|
a67e5e0f69
|
update package.json and footer
|
2019-05-20 17:44:18 +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 |
|