ansuz
|
31c6e7241e
|
Merge branch 'soon' into staging
|
2019-09-02 15:25:20 +02:00 |
|
yflory
|
a7bc83ac5d
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2019-09-02 11:33:36 +02:00 |
|
yflory
|
9e8c717035
|
Fix onlyoffice lastKnownHash bug
|
2019-09-02 11:30:48 +02:00 |
|
yflory
|
e131661673
|
Accept and decline ownership offers
|
2019-08-30 17:36:27 +02:00 |
|
yflory
|
9822c28f3b
|
Implement ADD_OWNER notification with pending_owner metadata
|
2019-08-30 16:41:48 +02:00 |
|
ansuz
|
1b7d984d39
|
Merge branch 'soon' into staging
|
2019-08-30 11:57:46 +02:00 |
|
yflory
|
416e0cde17
|
Fix removeOwnedChannel
|
2019-08-29 11:29:50 +02:00 |
|
yflory
|
2a91643d59
|
Remove an owner
|
2019-08-28 16:37:13 +02:00 |
|
yflory
|
f6762f7c01
|
Make the friends list from the share modal reusable
|
2019-08-28 15:29:38 +02:00 |
|
yflory
|
06809fd3ba
|
Update codemirror settings in realtime
|
2019-08-19 16:53:17 +02:00 |
|
yflory
|
c608bdd2dc
|
Merge branch 'off' into staging
|
2019-08-19 15:38:22 +02:00 |
|
yflory
|
656b129543
|
Ability to remove handlers from worker-channel and metadata-manager
|
2019-08-19 15:37:08 +02:00 |
|
yflory
|
c1656d7b5b
|
Merge branch 'unifiedMetadata' into staging
|
2019-08-19 15:27:59 +02:00 |
|
yflory
|
6f0062d023
|
Add comments and timeout errors
|
2019-08-19 14:37:55 +02:00 |
|
ansuz
|
04feef793b
|
resolve merge conflicts
|
2019-08-16 17:39:22 +02:00 |
|
yflory
|
c4a90a90f2
|
Fix disconnection event not propagating to the UI
|
2019-08-16 11:33:57 +02:00 |
|
yflory
|
eaeb995661
|
Remove debugging code
|
2019-08-14 10:38:42 +02:00 |
|
yflory
|
06748dcfb3
|
missing comma
|
2019-08-13 14:23:29 +02:00 |
|
yflory
|
970dcb8b8b
|
null is an object
|
2019-08-12 15:40:25 +02:00 |
|
yflory
|
3303e9738d
|
Fix drive deletion
|
2019-08-12 15:38:21 +02:00 |
|
yflory
|
5c6b3155ac
|
Add safety measures to avoid removing your drive by accident
|
2019-08-12 15:30:59 +02:00 |
|
ClemDee
|
b49c39b895
|
Fix file progress value going over 100%
|
2019-07-19 11:34:30 +02:00 |
|
yflory
|
51facff6fd
|
Send a mailbox address (encrypted) to the owned pads metadata
|
2019-07-17 17:01:25 +02:00 |
|
yflory
|
f0d753e3f4
|
Merge branch 'staging' into unifiedMetadata
|
2019-07-17 15:25:01 +02:00 |
|
yflory
|
7bc0c7ce95
|
Fix duplicate notifications n reconnect
|
2019-07-17 10:49:26 +02:00 |
|
yflory
|
9b45f0dd79
|
Add translation keys
|
2019-07-16 17:29:55 +02:00 |
|
yflory
|
65d76a9241
|
Merge branch 'request' into staging
|
2019-07-16 14:37:03 +02:00 |
|
yflory
|
a169b4c3b3
|
Display a notification when there is a new message from the support team
|
2019-07-16 14:31:57 +02:00 |
|
yflory
|
5be37f2e45
|
Unified metadata
|
2019-07-13 15:24:54 +02:00 |
|
yflory
|
60bea6b33b
|
Request capabilities part 2
|
2019-07-13 11:47:58 +02:00 |
|
yflory
|
4156b1988f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-07-11 14:16:31 +02:00 |
|
yflory
|
6f1e281cf8
|
request capabilities temp
|
2019-07-11 14:16:04 +02:00 |
|
ansuz
|
5f5cd1e045
|
oups, add a missing closing brace
|
2019-07-08 12:12:42 +02:00 |
|
ansuz
|
8be6c84e2f
|
guard against null elements in the drive
|
2019-07-08 12:10:57 +02:00 |
|
yflory
|
9d476ce9cd
|
Fix error in the console
|
2019-07-05 17:06:02 +02:00 |
|
yflory
|
abf8ef6276
|
Pin admin mailbox
|
2019-07-04 10:37:05 +02:00 |
|
yflory
|
77e893c3ea
|
Merge branch 'staging' into support
|
2019-07-02 14:46:36 +02:00 |
|
yflory
|
3f500cfd5c
|
lint compliance
|
2019-07-01 18:19:54 +02:00 |
|
yflory
|
7a0f30488c
|
Hide duplicates when receiving access to a pad via notifications
|
2019-07-01 18:07:40 +02:00 |
|
yflory
|
2e8e6e6de2
|
Return th timestamp in mailbox history
|
2019-07-01 13:42:40 +02:00 |
|
yflory
|
75e0b68f51
|
Add mailbox history
|
2019-06-27 18:21:54 +02:00 |
|
yflory
|
93b4dac8bb
|
Support mailbox in the support and admin apps
|
2019-06-27 17:08:23 +02:00 |
|
yflory
|
22c9af6961
|
Support page
|
2019-06-25 16:39:15 +02:00 |
|
yflory
|
59d5723f3e
|
Fix read-only spreadsheets
|
2019-06-24 18:17:42 +02:00 |
|
yflory
|
bba3e355d0
|
Invalid ID fix
|
2019-06-24 12:28:49 +02:00 |
|
yflory
|
f5858f524d
|
Fix invalid file ID in the drive
|
2019-06-24 12:17:08 +02:00 |
|
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
|
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 |
|
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
|
5a19f7cc5d
|
Recent pads improvements
|
2019-05-03 15:07:04 +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
|
1f3ef77349
|
Service workers tests
|
2019-04-09 16:29:42 +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
|
34cc90bd08
|
Add feedback
|
2019-03-05 11:17:31 +01:00 |
|
yflory
|
f04ba4a3d8
|
Too many false positive with the timeout detection
|
2019-02-05 16:17:54 +01:00 |
|
yflory
|
412670c8a6
|
PCS with owners and password for spreadsheets
|
2019-02-05 15:58:49 +01:00 |
|
yflory
|
07cd0b21b6
|
Fix last known hash sent to onlyoffice (it is already known...)
|
2019-01-31 15:26:03 +01:00 |
|
yflory
|
cb89a5fdfe
|
Test timeout to kill phantom viewers
|
2019-01-30 15:50:37 +01:00 |
|
yflory
|
d989b6d6e4
|
Fix one case of phantom viewers
|
2019-01-30 15:49:07 +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 |
|
yflory
|
b79ba61984
|
Improve realtime channel for onlyoffice
|
2019-01-15 10:46:39 +01:00 |
|
ansuz
|
6cf8720458
|
update how the async store chooses to prune history to avoid the diverged checkpoint bug
|
2019-01-14 16:40:54 +01:00 |
|
yflory
|
efdecd4059
|
First step for realtime in onlyoffice apps
|
2019-01-14 14:01:22 +01:00 |
|
yflory
|
41a1148c17
|
Use the same code for the different frontend channels
|
2019-01-11 15:30:26 +01:00 |
|
yflory
|
d87a87410d
|
Preserve hidden owned pads from a deleted folder
|
2019-01-08 13:57:22 +01:00 |
|
yflory
|
f2f9b57505
|
Own drive migration
|
2018-12-19 18:59:20 +01:00 |
|
yflory
|
bbc06f668f
|
Fix undefined hash for deleted shared folders
|
2018-12-17 15:49:48 +01:00 |
|
yflory
|
760f58b74c
|
Merge branch 'staging' into oo2
|
2018-12-13 16:24:11 +01:00 |
|
yflory
|
d88dee9a83
|
Restrict sending messages in a pad chat to editors only
|
2018-12-10 17:47:47 +01:00 |
|
yflory
|
a2e28e6e25
|
Fix missing avatar in cursor tooltip
|
2018-12-10 13:46:21 +01:00 |
|
yflory
|
081fc01694
|
Add a settings category about the cursor
|
2018-12-06 13:48:14 +01:00 |
|
yflory
|
f157f852b1
|
Fix and improve cursor
|
2018-12-06 11:54:34 +01:00 |
|
yflory
|
1ba80a344b
|
See other users' cursor position
|
2018-12-04 17:18:42 +01:00 |
|
yflory
|
ca45ff31d1
|
Refactor messenger to use commands from UI to store
|
2018-11-27 16:55:56 +01:00 |
|
yflory
|
4daa2266c0
|
Fix new network open for each shared folder
|
2018-11-08 18:24:06 +01:00 |
|
yflory
|
498703384f
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
2018-10-04 15:29:34 +02:00 |
|
yflory
|
5d3d591228
|
Keep trying until the first tab is loaded
|
2018-10-02 18:14:06 +02:00 |
|
yflory
|
c59d744d78
|
Fix loading a tab while another one is initializing the worker
|
2018-10-02 17:49:39 +02:00 |
|
yflory
|
0a83840c9c
|
View a shared folder with an unregistered user
|
2018-10-01 15:17:27 +02:00 |
|
yflory
|
17bc1ee703
|
Load shared folder when not logged in
|
2018-09-28 15:06:24 +02:00 |
|
yflory
|
179df27e3c
|
Fix autostore not displaying the error message when over pin limit
|
2018-09-17 11:23:35 +02:00 |
|
yflory
|
6c27d2964c
|
Disable friends chat in pad messenger
|
2018-09-14 15:42:41 +02:00 |
|
yflory
|
621fc9a897
|
Ability to disable messenger at a global level
|
2018-09-12 14:51:37 +02:00 |
|
yflory
|
d4dd58e7df
|
Add a pad room when the messenger is active in a pad
|
2018-09-07 19:35:06 +02:00 |
|
yflory
|
e6743887fc
|
Refactor contacts/messenger so that it is usable directly in the apps
|
2018-09-06 18:41:22 +02:00 |
|
yflory
|
525703e7d8
|
Fix autostore popup displayed for dropped files
|
2018-09-04 10:36:19 +02:00 |
|
yflory
|
bf9cf95292
|
Merge branch 'staging' into oo2
|
2018-09-03 10:49:12 +02:00 |
|
yflory
|
ee1027ceb9
|
Ability to import mediatags to the drive
|
2018-08-31 15:41:08 +02:00 |
|
yflory
|
7b06626581
|
Merge branch 'autostore' into staging
|
2018-08-30 10:26:19 +02:00 |
|
yflory
|
256b7b5bb4
|
Phantom viewers potential fix
|
2018-08-28 16:28:32 +02:00 |