 yflory
|
e58dfbabd4
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2020-04-23 15:08:24 +02:00 |
|
|
yflory
|
13e1d1267d
|
Add chat ID in the console
|
2020-04-23 15:08:13 +02:00 |
|
|
yflory
|
cf8841cdfa
|
Remove cba on non-owned pads
|
2020-04-22 10:44:16 +02:00 |
|
|
yflory
|
e5f1fa7ef0
|
Fix color by author automatically enabled for non-owned pads
|
2020-04-22 10:39:57 +02:00 |
|
|
yflory
|
2695b51b0d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-21 16:40:34 +02:00 |
|
|
yflory
|
440980c4af
|
Display preview with a single click
|
2020-04-21 16:40:19 +02:00 |
|
|
yflory
|
89de5869c5
|
Fix cursor and scroll position in codemirror after undo
|
2020-04-21 14:42:49 +02:00 |
|
|
yflory
|
aeb81fdfad
|
lint compliance
|
2020-04-21 13:35:36 +02:00 |
|
|
yflory
|
872e636ac5
|
Fix access modal in drive
|
2020-04-21 12:13:52 +02:00 |
|
|
yflory
|
97f9244efd
|
Merge branch 'soon' into staging
|
2020-04-21 12:05:16 +02:00 |
|
|
yflory
|
c2e0ed0d59
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-21 12:05:13 +02:00 |
|
|
yflory
|
1d0feeb323
|
Fix cba reset on join. Change how the cba state is stored
|
2020-04-21 12:04:24 +02:00 |
|
|
yflory
|
d8855ed5f7
|
Remove XXX
|
2020-04-20 18:32:13 +02:00 |
|
|
yflory
|
593011a657
|
Merge branch 'cba' into staging
|
2020-04-20 18:31:08 +02:00 |
|
|
yflory
|
8896b2eae2
|
Fix mediatag preview
|
2020-04-20 18:19:21 +02:00 |
|
|
yflory
|
22a2b85fae
|
Fix broken share modal
|
2020-04-20 18:14:38 +02:00 |
|
|
yflory
|
f2641bc0ee
|
Fix initial marker
|
2020-04-20 17:57:25 +02:00 |
|
|
yflory
|
6d84fc5b8a
|
Add initial marker to fix errors while 'joining' markers
|
2020-04-20 17:32:45 +02:00 |
|
|
yflory
|
c6cb9876a7
|
Fix secure iframe conflict with cba button
|
2020-04-20 16:47:04 +02:00 |
|
|
yflory
|
49eacf752b
|
Fix markers errors
|
2020-04-20 16:37:40 +02:00 |
|
|
yflory
|
0ca779dbd1
|
Fix 'enable cba' button in properties
|
2020-04-20 16:20:46 +02:00 |
|
|
yflory
|
b208ca367d
|
Merge branch 'staging' into cba
|
2020-04-20 15:38:47 +02:00 |
|
|
yflory
|
9f5f4a4d52
|
Fix possible duplicate author id
|
2020-04-20 15:38:27 +02:00 |
|
|
yflory
|
41c0704ad8
|
Page mode by default in rich text
|
2020-04-20 11:56:12 +02:00 |
|
|
yflory
|
ca9f874afb
|
Redraw mermaid on preview
|
2020-04-20 11:09:46 +02:00 |
|
|
yflory
|
1e9b9913c5
|
Better debug function and fix marker error
|
2020-04-17 18:18:16 +02:00 |
|
|
yflory
|
19e565a7dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-17 17:38:22 +02:00 |
|
|
yflory
|
adae4b690b
|
outer.css cache busting
|
2020-04-17 17:38:15 +02:00 |
|
|
yflory
|
9ba2d11cd5
|
Guard against a type error
|
2020-04-17 16:50:41 +02:00 |
|
|
yflory
|
d27dc768f3
|
Fix missing button to enable cba
|
2020-04-17 15:56:22 +02:00 |
|
|
yflory
|
283f739be5
|
lint compliance
|
2020-04-17 15:30:27 +02:00 |
|
|
yflory
|
dd814713dd
|
Merge branch 'staging' into cba
|
2020-04-17 15:17:24 +02:00 |
|
|
yflory
|
f03713e60a
|
Fix small issues, clean debugging logs and add known issues
|
2020-04-17 15:16:49 +02:00 |
|
|
yflory
|
92738828ff
|
Merge branch 'debugtime' into cba
|
2020-04-17 10:31:42 +02:00 |
|
|
yflory
|
1d3f0ded81
|
Fix more markers errors
|
2020-04-17 10:31:37 +02:00 |
|
|
yflory
|
38acd01b35
|
Fix issues with falsy values
|
2020-04-16 16:24:09 +02:00 |
|
|
yflory
|
b74a4b6bb4
|
Fix more cba issues and add debugging data
|
2020-04-16 16:03:17 +02:00 |
|
|
yflory
|
026bf6a425
|
Fix obvious issues in cba
|
2020-04-16 11:20:18 +02:00 |
|
|
yflory
|
9c5f0c0d6f
|
Use rgba instead of #RRGGBBAA for the author markers
|
2020-04-16 10:36:51 +02:00 |
|
|
yflory
|
cdcb01623d
|
Merge branch 'q' into staging
|
2020-04-15 17:03:02 +02:00 |
|
|
yflory
|
7890342ae1
|
Add cba hint
|
2020-04-15 16:49:38 +02:00 |
|
|
yflory
|
fd2ee0fced
|
Add comment
|
2020-04-15 16:23:36 +02:00 |
|
|
yflory
|
1dee2fd13c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-15 16:07:29 +02:00 |
|
|
yflory
|
f83179cb62
|
Fix mediatag cache preventing preview modal
|
2020-04-15 16:07:18 +02:00 |
|
|
yflory
|
94c9e47d32
|
Remember the state of cba per user in their owned pads
|
2020-04-15 15:36:37 +02:00 |
|
|
yflory
|
87fc1f8daf
|
Show/hide and enable/disable cba
|
2020-04-15 15:20:04 +02:00 |
|
|
yflory
|
88760fde6a
|
Clean the code
|
2020-04-15 13:27:25 +02:00 |
|
|
yflory
|
d41c362d46
|
Fix more errors after ot
|
2020-04-14 17:11:47 +02:00 |
|
|
yflory
|
5fe7f55f51
|
Fix share with a team when we don't have contacts yet
|
2020-04-14 10:47:53 +02:00 |
|
|
yflory
|
a70233d492
|
Fix OT errors
|
2020-04-10 14:41:51 +02:00 |
|
|
yflory
|
62fde59a89
|
temp
|
2020-04-09 16:06:04 +02:00 |
|
|
yflory
|
cba8f5fce6
|
Merge branch 'staging' into stoppegp-code-authorcolors-PR
|
2020-04-08 17:03:30 +02:00 |
|
|
yflory
|
ee3adccafc
|
Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR
|
2020-04-08 17:03:09 +02:00 |
|
|
yflory
|
1551a1b969
|
lint compliance
|
2020-04-07 17:14:06 +02:00 |
|
|
yflory
|
0ccc57f6f7
|
Protect current pad keys in the unsafe iframe
|
2020-04-07 17:12:06 +02:00 |
|
|
yflory
|
43904df0fb
|
Display properties modal in the secure iframe
|
2020-04-07 17:04:39 +02:00 |
|
|
yflory
|
ca8c50ca37
|
Merge branch 'staging' into secureiframe
|
2020-04-07 15:41:49 +02:00 |
|
|
yflory
|
e5bcaeedce
|
Fix regression in the access modal
|
2020-04-07 15:38:16 +02:00 |
|
|
yflory
|
4f838777ab
|
Merge branch 'q' into secureiframe
|
2020-04-07 15:24:17 +02:00 |
|
|
yflory
|
2aec7c2569
|
Open the access modal in the secure iframe
|
2020-04-07 15:24:12 +02:00 |
|
|
yflory
|
6103588faa
|
Fix access modal bug introduced with the latest commit
|
2020-04-07 15:22:40 +02:00 |
|
|
yflory
|
19a0dafbe1
|
Merge branch 'q' into secureiframe
|
2020-04-07 14:54:48 +02:00 |
|
|
yflory
|
62187d855f
|
lint compliance
|
2020-04-07 14:29:58 +02:00 |
|
|
yflory
|
fc2cd19821
|
lint compliance
|
2020-04-07 14:29:31 +02:00 |
|
|
yflory
|
894a355f0a
|
Merge filepicker and share iframes
|
2020-04-07 14:27:44 +02:00 |
|
|
yflory
|
4672bf794b
|
Make sure we don't try to get metadata for blobs
|
2020-04-07 11:03:35 +02:00 |
|
|
yflory
|
9de345044a
|
Prompt anonymous users to login if they should create a checkpoint in oo
|
2020-04-07 10:47:57 +02:00 |
|
|
yflory
|
a834d653aa
|
Fix download button size in mediatag preview
|
2020-04-06 16:48:42 +02:00 |
|
|
yflory
|
f5de72dcb2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2020-04-06 16:27:12 +02:00 |
|
|
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
|
c6fa00b14c
|
Add a start value to the new debug tool to simulate a user joining from a checkpoint
|
2020-04-03 11:46:05 +02:00 |
|
|
yflory
|
ae78f0a5df
|
Merge branch 'staging' into debugtime
|
2020-04-03 11:20:03 +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
|
8a658336a7
|
Fix issues with the new debugging code
|
2020-04-03 11:19:18 +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
|
1169156e55
|
Replay history in order
|
2020-04-02 10:21:12 +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 |
|