Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
2017-08-17 16:17:57 +02:00 |
|
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:44:41 +02:00 |
|
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:42:28 +02:00 |
|
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
2017-08-17 15:42:26 +02:00 |
|
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
2017-08-17 15:41:04 +02:00 |
|
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 14:55:53 +02:00 |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
2017-08-17 14:55:44 +02:00 |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
2017-08-17 12:14:19 +02:00 |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
2017-08-16 14:30:17 +02:00 |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:40:34 +02:00 |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
2017-08-16 12:40:15 +02:00 |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:35:13 +02:00 |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
2017-08-16 12:34:56 +02:00 |
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:15:20 +02:00 |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
2017-08-16 12:15:08 +02:00 |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
2017-08-16 12:11:25 +02:00 |
|
Caleb James DeLisle
|
b0b1ed037c
|
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
|
2017-08-16 10:19:24 +02:00 |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-14 16:24:17 +02:00 |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
2017-08-14 16:23:38 +02:00 |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
2017-08-14 14:41:23 +02:00 |
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02:00 |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 17:28:42 +02:00 |
|
Caleb James DeLisle
|
7a698d092e
|
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
|
2017-08-11 17:28:23 +02:00 |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
2017-08-11 15:21:26 +02:00 |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
2017-08-11 13:09:34 +02:00 |
|
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
2017-08-11 13:04:03 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
2017-08-11 12:56:42 +02:00 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
2017-08-11 12:56:06 +02:00 |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02:00 |
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
2017-08-11 10:40:57 +02:00 |
|
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
2017-08-10 21:40:34 +02:00 |
|
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
2017-08-10 18:39:16 +02:00 |
|
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
2017-08-10 18:31:44 +02:00 |
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-10 18:06:58 +02:00 |
|
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
2017-08-10 18:06:47 +02:00 |
|
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
2017-08-10 14:53:12 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Caleb James DeLisle
|
0dde1d7507
|
wip
|
2017-08-10 14:49:21 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +02:00 |
|
Pierre Bondoerffer
|
9dce40f3af
|
only add the splitter once
|
2017-08-10 14:34:48 +02:00 |
|
Pierre Bondoerffer
|
4026994310
|
make splitter work when scrolling
|
2017-08-10 14:25:31 +02:00 |
|
Caleb James DeLisle
|
c304071492
|
wip
|
2017-08-09 17:37:55 +02:00 |
|
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
2017-08-09 16:28:51 +02:00 |
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 16:06:46 +02:00 |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02:00 |