Caleb James DeLisle
|
e2719d9098
|
Add media-tag-nacl to cryptpad so it will be hosted on the server
|
7 years ago |
|
yflory
|
885282ddea
|
Fix undefined friend
|
7 years ago |
|
Caleb James DeLisle
|
a60709ff73
|
Infinite spinner popup leads to frame attempting to reload and failing
|
7 years ago |
|
yflory
|
b8971cdc23
|
Add previewMode settings to code2
|
7 years ago |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
7 years ago |
|
yflory
|
f54dc7505c
|
Migrate indentation settings to a settings subobject
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
yflory
|
f06683e949
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
7 years ago |
|
ansuz
|
9a23b77b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
ba0e935add
|
stub localStorage, and handle errors that might come from touching localStorage
|
7 years ago |
|
ansuz
|
be8ea4102e
|
keep trying to parse the hash until it works
|
7 years ago |
|
yflory
|
4db4f66786
|
Remove an unnecessary fix for Safari
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
Caleb James DeLisle
|
1044531806
|
Fix Safari iframe size issue
|
7 years ago |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
7 years ago |
|
ansuz
|
595fa4c2e4
|
Merge branch 'soon'
|
7 years ago |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
7 years ago |
|
yflory
|
51fa6287c1
|
Enable notifications in secure pads
|
7 years ago |
|
yflory
|
642dc17910
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
901917983b
|
Fix an issue preventing pads to be stored in the drive
|
7 years ago |
|
ansuz
|
40f062abda
|
restore app usage report in new pad
|
7 years ago |
|
ansuz
|
8fb7fef3f5
|
regular expressions are never falsey
|
7 years ago |
|
ansuz
|
24eac9b4a6
|
test for flakey tests
|
7 years ago |
|
ansuz
|
7d2a76f4d6
|
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
|
7 years ago |
|
ansuz
|
288c03bb41
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
fe03e6ae83
|
bad code, lint
|
7 years ago |
|
ansuz
|
430a6f7b77
|
lint compliance
|
7 years ago |
|
Caleb James DeLisle
|
190dff1c9b
|
Use the bounce app for opening a link with the right click
|
7 years ago |
|
yflory
|
dec870d2bd
|
Fix selection in the drive search results
|
7 years ago |
|
yflory
|
4bceef8952
|
Fix the upload status table missing in the drive
|
7 years ago |
|
yflory
|
0b4e044540
|
Fix the plugin to open a link in a new tab in pad
|
7 years ago |
|
yflory
|
d9a4a32bf9
|
Fix avatar for anonymous users in secure pads
|
7 years ago |
|
yflory
|
00fda0d7d7
|
Fix avatar in read-only mode (secure pads)
|
7 years ago |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
7 years ago |
|
yflory
|
147d88d845
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
e43c68aa48
|
Fix viewers number in secure iframe
|
7 years ago |
|
yflory
|
f89015d9ed
|
Update the tab title to match the pad title in pad2
|
7 years ago |
|
ansuz
|
1280cd1659
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
51c065d13c
|
Fix link to main in the new toolbar
|
7 years ago |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
7 years ago |
|
ansuz
|
536fe04790
|
emit notification when alert, confirm, or prompt are called
|
7 years ago |
|
Caleb James DeLisle
|
e4a356d873
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
056285a7b6
|
Move pad2 to pad and create bounce app
|
7 years ago |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
7 years ago |
|
ansuz
|
5fbbaee2f5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
6314487d98
|
handle unfriends in ui
|
7 years ago |
|
ansuz
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
7 years ago |
|
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 |
|
Caleb James DeLisle
|
e62faf7c7b
|
Edge fix, always use async iframe onLoad rather than invoking it manually
|
7 years ago |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
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
|
a99eb9365e
|
correctly set indentation preferences when changing languages
|
7 years ago |
|
ansuz
|
f58d4c941f
|
clean up a bit
|
7 years ago |
|
ansuz
|
ea5f47f0f9
|
remove some TODOs and solve some wee bugs
|
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 |
|
ansuz
|
443d8a8941
|
remove unnecessary files
|
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
|
dc283c2d74
|
Load 1, load 2... not load 1, load 3.
|
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 |
|
yflory
|
d6c33fdf4f
|
Ghost icon to add a pad
|
7 years ago |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
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
|
98daf10ed1
|
Ability to collapse the root directory in the drive
|
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
|
20a68ad71c
|
Hide the template button if the pad2 is a template
|
7 years ago |
|
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
7 years ago |
|
yflory
|
4089803785
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
7 years ago |
|
yflory
|
8d020833af
|
Add missing file
|
7 years ago |
|
Caleb James DeLisle
|
bffa4d01a8
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
7 years ago |
|
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
7 years ago |
|
yflory
|
1da11a1883
|
Disable edition in readonly mode 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 |
|
Pierre Bondoerffer
|
5e22e1dc59
|
use CryptPad instead of Cryptpad in titles
|
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
|
4e62f79594
|
stop referring to deleted file as background image
|
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
|
52d344c3d1
|
Merge branch 'soon'
|
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
|
5b7d1cccd7
|
fix display and logic for tab setting checkbox
|
7 years ago |