yflory
|
15d86c9bd1
|
Merge branch 'pcs' into staging
|
2020-04-06 16:26:38 +02:00 |
|
yflory
|
8370f3121c
|
Remove XXX
|
2020-04-06 16:26:29 +02:00 |
|
yflory
|
3aefc3a893
|
Fix icon size in the new pad modal
|
2020-04-06 16:13:51 +02:00 |
|
yflory
|
0f21f3118b
|
Fix lightbox errors
|
2020-04-06 16:00:01 +02:00 |
|
yflory
|
c29b7d3389
|
Fix reference error
|
2020-04-06 15:52:13 +02:00 |
|
yflory
|
20111e8416
|
Drop support for external URL as avatar
|
2020-04-06 13:22:56 +02:00 |
|
yflory
|
9da47ebac9
|
lint compliance
|
2020-04-06 13:22:22 +02:00 |
|
yflory
|
033b784576
|
Add max file size in whiteboard
|
2020-04-06 13:21:08 +02:00 |
|
yflory
|
175ee492a5
|
Merge branch 'staging' into lightbox
|
2020-04-06 11:43:13 +02:00 |
|
yflory
|
35394476a6
|
Improve scrollbars and modal size
|
2020-04-06 11:42:47 +02:00 |
|
yflory
|
18a4d2a72c
|
Merge duplicated code between framework and whiteboard
|
2020-04-03 15:31:42 +02:00 |
|
yflory
|
7ca45eac72
|
Add preview for mermaid graphs in code
|
2020-04-03 15:01:52 +02:00 |
|
yflory
|
3bc32f6085
|
Start at the correct index when previewing multiple mediatags
|
2020-04-03 12:32:25 +02:00 |
|
yflory
|
b4c61ee753
|
Fix preview modal not stopping keydown propagation in drive
|
2020-04-03 12:31:39 +02:00 |
|
yflory
|
5739773378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-03 11:19:47 +02:00 |
|
yflory
|
902e9624e8
|
Don't send encrypted messages to chainpad
|
2020-04-03 11:19:35 +02:00 |
|
yflory
|
d12fad3420
|
Fix kanban edit modal not locked on disconnect
|
2020-04-02 16:16:40 +02:00 |
|
yflory
|
572f81877f
|
Fix reconnecting issues after EUNKNOWN and ENOENT
|
2020-04-02 15:28:33 +02:00 |
|
yflory
|
c0f8129675
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-02 10:25:36 +02:00 |
|
yflory
|
32406a5995
|
Merge branch 'master' into staging
|
2020-04-02 10:23:09 +02:00 |
|
yflory
|
572db00987
|
Preview multiple mediatags
|
2020-04-01 12:04:31 +02:00 |
|
yflory
|
81b460abd8
|
Open pdf in the file app
|
2020-03-31 17:55:31 +02:00 |
|
yflory
|
d8d515a450
|
Add spinner while loading preview
|
2020-03-31 17:03:16 +02:00 |
|
yflory
|
6a10ec711a
|
Preview mediatag in the drive and in diffMarked
|
2020-03-31 16:43:00 +02:00 |
|
yflory
|
817309d602
|
Move code from ui-elements to common-interface
|
2020-03-31 10:38:42 +02:00 |
|
yflory
|
179e7d68b4
|
Add new common-mediatag file
|
2020-03-31 10:38:27 +02:00 |
|
yflory
|
b27eb956df
|
Merge branch 'staging' into lightbox
|
2020-03-31 10:21:54 +02:00 |
|
yflory
|
44d05d1756
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2020-03-30 16:42:42 +02:00 |
|
yflory
|
8210ae3a09
|
Fix duplicate text bug #352
|
2020-03-30 16:41:47 +02:00 |
|
yflory
|
b4b1ad893f
|
Disable cursor position in rich text (possible cause of duplicate text)
|
2020-03-30 12:20:24 +02:00 |
|
yflory
|
938e5c5cb1
|
Merge branch 'staging' into lightbox
|
2020-03-30 12:10:42 +02:00 |
|
yflory
|
e5d4dbea30
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-30 12:10:14 +02:00 |
|
yflory
|
acada4c733
|
lint compliance
|
2020-03-30 12:10:06 +02:00 |
|
yflory
|
75e5d3cc42
|
Move the mediatag and avatar code outsite of common-ui-elements
|
2020-03-30 12:09:12 +02:00 |
|
yflory
|
7047abe407
|
Fix cache issues with mermaid
|
2020-03-27 17:25:45 +01:00 |
|
yflory
|
812d8f8770
|
Deprecate 'skip PCS' feature
|
2020-03-27 15:48:34 +01:00 |
|
yflory
|
05cb082e2f
|
Stop refreshing the usage bar if the tab is not visible
|
2020-03-27 15:16:17 +01:00 |
|
yflory
|
980baf9ce3
|
Fix usage bar in drive and read only teams
|
2020-03-27 15:06:15 +01:00 |
|
yflory
|
9a4da6e6e0
|
Remove console log
|
2020-03-27 13:58:53 +01:00 |
|
yflory
|
6cde052a46
|
Update mermaid
|
2020-03-27 13:54:43 +01:00 |
|
yflory
|
7b82d9dba4
|
Remove/fix XXX
|
2020-03-26 17:25:36 +01:00 |
|
yflory
|
c7688b7c8c
|
Merge branch 'duplicateText2' into staging
|
2020-03-26 16:23:12 +01:00 |
|
yflory
|
e15196bd53
|
Merge branch 'reconnect' into staging
|
2020-03-26 15:24:38 +01:00 |
|
yflory
|
cad12ab31f
|
Merge branch 'soon' into staging
|
2020-03-26 15:23:48 +01:00 |
|
yflory
|
5248c81b65
|
Fix opening a text blob in the code editor
|
2020-03-26 14:47:55 +01:00 |
|
yflory
|
7b15775d75
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-26 13:12:52 +01:00 |
|
yflory
|
ed722f7385
|
Fix properties and access modal being opened multiple times at once
|
2020-03-26 13:12:41 +01:00 |
|
yflory
|
36d7bb031f
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2020-03-26 11:11:27 +01:00 |
|
yflory
|
86959bc048
|
Add Hindi translation
|
2020-03-26 11:10:44 +01:00 |
|
yflory
|
d7b2876711
|
Fix UI for brush settings in whiteboard
|
2020-03-25 17:37:52 +01:00 |
|
yflory
|
c92db4fd46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-25 17:23:44 +01:00 |
|
yflory
|
f780087ac7
|
Better UI for whiteboard controls
|
2020-03-25 17:23:29 +01:00 |
|
yflory
|
fbdb8e547e
|
Merge branch 'soon' into staging
|
2020-03-25 16:33:47 +01:00 |
|
yflory
|
dcfd9c5a73
|
Smaller palette in whiteboard
|
2020-03-25 16:33:45 +01:00 |
|
yflory
|
a6f8160ab4
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2020-03-24 18:38:23 +01:00 |
|
yflory
|
ba4614f0e8
|
Fix a type error in onlyoffice
|
2020-03-24 18:38:08 +01:00 |
|
yflory
|
facc6d877a
|
Remove hardcoded translation key
|
2020-03-24 18:36:55 +01:00 |
|
yflory
|
64596b8097
|
lint compliance
|
2020-03-24 16:16:25 +01:00 |
|
yflory
|
fe14399e67
|
Merge branch 'whiteboard' into soon
|
2020-03-24 16:15:13 +01:00 |
|
yflory
|
ae1b59b2c1
|
Fix canvas initial size
|
2020-03-24 15:32:56 +01:00 |
|
yflory
|
24e474e688
|
Big canvas
|
2020-03-24 15:25:58 +01:00 |
|
yflory
|
9aaddea148
|
Add edPublic to user profiles
|
2020-03-24 13:18:32 +01:00 |
|
yflory
|
e74f713983
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2020-03-24 12:40:57 +01:00 |
|
yflory
|
a4d1b47a4c
|
Fix 'readonly' mode after disconnection in onlyoffice
|
2020-03-24 12:40:13 +01:00 |
|
yflory
|
2c4c18bef6
|
Merge branch 'soon' into staging
|
2020-03-24 12:39:33 +01:00 |
|
yflory
|
2fe417bf52
|
Send contacts public data to accounts
|
2020-03-23 18:01:52 +01:00 |
|
yflory
|
dc0b26da0b
|
Merge branch 'soon' into staging
|
2020-03-23 12:33:17 +01:00 |
|
yflory
|
de456cd70a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-23 12:32:21 +01:00 |
|
yflory
|
8e8b371690
|
Fix issues with trim history in spreadsheets
|
2020-03-23 12:32:03 +01:00 |
|
yflory
|
7ddc472658
|
Restore Dutch translation
|
2020-03-23 11:53:21 +01:00 |
|
 yfloryandansuz
|
dc840c2a70
|
Fix checkboxes in the markdown renderer #511
|
2020-03-20 10:45:42 -04:00 |
|
yflory
|
a13561eb8d
|
Fix checkboxes in the markdown renderer #511
|
2020-03-20 13:45:45 +01:00 |
|
yflory
|
12520ecb53
|
Remove unnecessary log
|
2020-03-19 11:46:39 +01:00 |
|
yflory
|
1ea00cfdfa
|
Remove invalid 'DISCONNECTED' message in drive history mode
|
2020-03-19 11:45:17 +01:00 |
|
yflory
|
4cada76c7e
|
Merge branch 'ooBuild' into soon
|
2020-03-18 15:35:40 +01:00 |
|
yflory
|
f0ff7d1968
|
Merge branch 'soon' into ooBuild
|
2020-03-18 15:12:29 +01:00 |
|
yflory
|
3b82c5504e
|
Refocus the iframe when closing the lock modal
|
2020-03-18 15:12:01 +01:00 |
|
yflory
|
dba74df532
|
Fix lock modal
|
2020-03-18 15:03:44 +01:00 |
|
yflory
|
e1119290df
|
Better lock message
|
2020-03-18 14:47:33 +01:00 |
|
yflory
|
7bb59b518f
|
Abort instantly when you want a lock but a global lock exists
|
2020-03-18 13:59:44 +01:00 |
|
yflory
|
7254d093a3
|
Fix checkpoint issues in onlyoffice
|
2020-03-18 13:27:12 +01:00 |
|
yflory
|
4484cda9b6
|
Use a new path to force a cache reload on onlyoffice
|
2020-03-18 10:25:18 +01:00 |
|
yflory
|
70aad68d07
|
New OnlyOffice build
|
2020-03-18 10:18:44 +01:00 |
|
yflory
|
dee8007cc4
|
Fix worksheet IDs in onlyoffice
|
2020-03-18 10:17:13 +01:00 |
|
yflory
|
f7e0d03898
|
Merge branch 'staging' into ooBuild
|
2020-03-17 16:26:03 +01:00 |
|
yflory
|
923616aef0
|
Use each process in order instead of using a random one
|
2020-03-17 15:10:23 +01:00 |
|
yflory
|
fb0eb1b20c
|
Use more subprocesses
|
2020-03-17 14:18:41 +01:00 |
|
yflory
|
0d636dabc9
|
Check signature for history keeper in a different process
|
2020-03-17 13:29:53 +01:00 |
|
yflory
|
ab6ccfe1f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-16 16:46:25 +01:00 |
|
yflory
|
cdcc52224a
|
Reload when the API version changes
|
2020-03-16 16:46:09 +01:00 |
|
yflory
|
0074824a0a
|
Fix XXX in jKanban
|
2020-03-16 14:59:32 +01:00 |
|
yflory
|
fbae166702
|
Remove XXX
|
2020-03-16 14:51:43 +01:00 |
|
yflory
|
abc27295ab
|
Fix XXX in kanban
|
2020-03-16 14:49:59 +01:00 |
|
yflory
|
747657a559
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-03-16 14:42:40 +01:00 |
|
yflory
|
15925f625d
|
Fix keyboard shortcuts in kanban edit modal
|
2020-03-16 14:42:27 +01:00 |
|
yflory
|
d69ad7c0e6
|
Send the error to chainpad when a patch is not sent
|
2020-03-16 12:06:18 +01:00 |
|
yflory
|
27c1291182
|
Fix duplicate text bug on reconnect or ACK timeout
|
2020-03-16 11:19:04 +01:00 |
|
yflory
|
7b5a15cef7
|
Merge branch 'staging' into reconnect
|
2020-03-13 17:41:44 +01:00 |
|
yflory
|
578042154e
|
Better reconnect after invalid lastKnownHash
|
2020-03-13 17:39:16 +01:00 |
|
yflory
|
d53e9cff02
|
Fix 'clear filter' button
|
2020-03-13 15:10:07 +01:00 |
|