Caleb James DeLisle
|
041071e61c
|
manual merge
|
7 years ago |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
7 years ago |
|
yflory
|
5bf966633c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
ansuz
|
739903d511
|
don't check account usage if you aren't logged in
|
7 years ago |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
7 years ago |
|
ansuz
|
e8298f165a
|
only display first letter of name if user has no avatar
|
7 years ago |
|
ansuz
|
85003f7a23
|
lint compliance
|
7 years ago |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
7 years ago |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
7 years ago |
|
yflory
|
0bb6698399
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
e85b34f127
|
Add embed options in the secure pad hashes
|
7 years ago |
|
ansuz
|
3d2a2da74e
|
add listAllTags api
|
7 years ago |
|
ansuz
|
0e8a26e8eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
1c50bb3f61
|
clear hung tooltips
|
7 years ago |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
7 years ago |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
7 years ago |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
7 years ago |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
7 years ago |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
7 years ago |
|
yflory
|
f12f4bb925
|
Integrate filepicker secure iframe in the code2 app
|
7 years ago |
|
ansuz
|
72ef730f23
|
implement tag-related functions
|
7 years ago |
|
ansuz
|
0302c06d0e
|
send feedback if client does not support symbols
|
7 years ago |
|
yflory
|
89b7b644f3
|
Enable drag & upload in code2 and prepare filepicker
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
7 years ago |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
7 years ago |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
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
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
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
|
b71f1860db
|
make uid function reusable
|
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 |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
7 years ago |
|
yflory
|
f40d2c0b20
|
Add templates to 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
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
7 years ago |
|
yflory
|
f5855a2870
|
Add account name in metadata manager
|
7 years ago |
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
7 years ago |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
7 years ago |