ansuz
|
841e3af8da
|
handle unfriends. clean up. better input validation
|
7 years ago |
ansuz
|
c66a0c55e0
|
ensure that function signatures are correct
|
7 years ago |
ansuz
|
91f6e3e543
|
remove a lot of dead code
|
7 years ago |
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
7 years ago |
ansuz
|
9e04d039d7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
22d754d514
|
handle user renames
|
7 years ago |
Caleb James DeLisle
|
0a6f81850f
|
Handle infinite-spinner errors and properly inform the user
|
7 years ago |
ansuz
|
f58d4c941f
|
clean up a bit
|
7 years ago |
ansuz
|
b75a951a98
|
encode messages with 'author' field instead of 'channel'
|
7 years ago |
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
7 years ago |
ansuz
|
013b75ae67
|
implement history range requests
|
7 years ago |
ansuz
|
b71f1860db
|
make uid function reusable
|
7 years ago |
Caleb James DeLisle
|
75fde58846
|
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
|
7 years ago |
Caleb James DeLisle
|
5d9599c9b7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
cbac5e417c
|
Make loading screen come much earlier on pad2
|
7 years ago |
yflory
|
b6881349be
|
Fix an issue with the notifications in secure pads
|
7 years ago |
yflory
|
ec64ac485d
|
Fix 'not a function' error
|
7 years ago |
Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
7 years ago |
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
7 years ago |
Caleb James DeLisle
|
8a9755611a
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
2dacd57e76
|
fix caching on favicon
|
7 years ago |
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
7 years ago |
yflory
|
e81bb3fe08
|
Fix profile link in the userlist
|
7 years ago |
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
7 years ago |
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
7 years ago |
yflory
|
b4864b96ac
|
Add a recent pads category in the drive
|
7 years ago |
Caleb James DeLisle
|
4f3b4a30ee
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
4b70fc9f49
|
Use resources from the original origin in pad2
|
7 years ago |
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
7 years ago |
yflory
|
f40d2c0b20
|
Add templates to pad2
|
7 years ago |
yflory
|
8d020833af
|
Add missing file
|
7 years ago |
yflory
|
8d837d22ea
|
Add history to pad2
|
7 years ago |
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
7 years ago |
yflory
|
e2d39de143
|
Forget button in pad2
|
7 years ago |
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
7 years ago |
yflory
|
140c6f3776
|
Add limit warning in pad2
|
7 years ago |
yflory
|
30aef71603
|
Enable avatars in pad2
|
7 years ago |
yflory
|
f88a6f63fe
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fb4808e1e1
|
Fix queries callback arguments
|
7 years ago |
Caleb James DeLisle
|
6dd1643738
|
Manual merge work done on loading page to pad2
|
7 years ago |
Caleb James DeLisle
|
8b702e0150
|
wip
|
7 years ago |
yflory
|
e65b2f4e9f
|
Add shareButton to pad2
|
7 years ago |
yflory
|
beb45740d0
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
7 years ago |
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
7 years ago |
Caleb James DeLisle
|
498c8229e9
|
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
|
7 years ago |
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
7 years ago |
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
7 years ago |
yflory
|
dd9b38066e
|
Change display name in useradmin menu
|
7 years ago |
yflory
|
a96d447e8b
|
Add notifications in pad2
|
7 years ago |
Caleb James DeLisle
|
cf6d8c83b2
|
Fix title setter logic and separate it from UI
|
7 years ago |
Caleb James DeLisle
|
ec87f3f897
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
415399ef64
|
Changes to support title change in metadata
|
7 years ago |
yflory
|
d1affebd14
|
Title in pad2
|
7 years ago |
yflory
|
604415b32c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fab3d67b75
|
Enable title in pad2
|
7 years ago |
Caleb James DeLisle
|
909bda4302
|
This should fix laxy metadata
|
7 years ago |
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
7 years ago |
Caleb James DeLisle
|
2490ee253f
|
Added setDisplayName RPC
|
7 years ago |
yflory
|
887a26b1a6
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
0b34ceb0eb
|
Added RPC setPadTitleInDrive()
|
7 years ago |
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
7 years ago |
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
7 years ago |
yflory
|
25466aa2f9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
1d237735ef
|
Useradmin menu in pad2
|
7 years ago |
Caleb James DeLisle
|
3b5af3ea74
|
sframe common changes
|
7 years ago |
yflory
|
d1157c4d72
|
Add missing file
|
7 years ago |
yflory
|
d237c76f6c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
f5855a2870
|
Add account name in metadata manager
|
7 years ago |
Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
7 years ago |
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
7 years ago |
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
7 years ago |
ansuz
|
a125253cde
|
lint compliance
|
7 years ago |
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
7 years ago |
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fb512c8923
|
Toolbar in pad2
|
7 years ago |
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
7 years ago |
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
7 years ago |
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
7 years ago |
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
7 years ago |
ansuz
|
130b330ede
|
refactor messaging
|
7 years ago |
ansuz
|
736288a85b
|
lint compliance
|
7 years ago |
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
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
|
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 |
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
7 years ago |
ansuz
|
284124a32d
|
WIP
|
7 years ago |
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
7 years ago |
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
7 years ago |
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
7 years ago |
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
0dde1d7507
|
wip
|
7 years ago |
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
7 years ago |
Caleb James DeLisle
|
c304071492
|
wip
|
7 years ago |