yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
7 years ago |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
7 years ago |
|
Caleb James DeLisle
|
4881f8d030
|
Remove X-Frame-Options because it cannot work with a cross-domain iframe.
|
7 years ago |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
7 years ago |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
7 years ago |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
7 years ago |
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
7 years ago |
|
Caleb James DeLisle
|
e6cdf955d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
7 years ago |
|
Caleb James DeLisle
|
f7b2aa85b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
7 years ago |
|
yflory
|
df8851a53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
df0b7155f6
|
Add missing french translation
|
7 years ago |
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
7 years ago |
|
Caleb James DeLisle
|
4213d6de70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
d6125d864c
|
Added Yann's bio
|
7 years ago |
|
yflory
|
a39f802b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
9213aa7ee4
|
simplify example config
|
7 years ago |
|
yflory
|
e4d842ed08
|
Fix typos in the french translation
|
7 years ago |
|
ansuz
|
7537caf8fe
|
make footer translateable
|
7 years ago |
|
ansuz
|
bd45aeaa03
|
bump package.json version
|
7 years ago |
|
ansuz
|
d3a298d639
|
Merge branch 'ui-integration' into staging
|
7 years ago |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
7 years ago |
|
Caleb James DeLisle
|
40287f973c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
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.
|
7 years ago |
|
CatalinScr
|
fd3fd945c8
|
Updated the Log in Page
|
7 years ago |
|
CatalinScr
|
1f4d0a0a56
|
Repaired a bug
|
7 years ago |
|
CatalinScr
|
dd48cf7c90
|
updated the register page
|
7 years ago |
|
CatalinScr
|
3196d4558f
|
repaired the responsive error at about page
|
7 years ago |
|
ansuz
|
9a6bf302b4
|
ignore ckeditor hacks
|
7 years ago |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
723151254c
|
remove a debug line before release which killed CSP
|
7 years ago |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
7 years ago |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
7 years ago |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
7 years ago |
|
ansuz
|
736288a85b
|
lint compliance
|
7 years ago |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
7 years ago |
|
Caleb James DeLisle
|
7c8df61f91
|
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
|
7 years ago |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
7 years ago |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
7 years ago |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
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.
|
7 years ago |
|
ansuz
|
9b86003722
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |