ansuz
|
4c0049ad55
|
don't log presence of other users as 'joins' when you have first joined
|
7 years ago |
|
ansuz
|
325f685f3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
1cbf1aec92
|
prevent undefined access in non-sframe apps
|
7 years ago |
|
yflory
|
ac1b67ad67
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
1245b4d244
|
Enable thumbnails in poll and whiteboard
|
7 years ago |
|
ansuz
|
d644054e3f
|
lint compliance
|
7 years ago |
|
ansuz
|
ed253e6c75
|
Merge branch 'staging' into evilham
|
7 years ago |
|
ansuz
|
df1a700cb2
|
disable thumbnail test. add test for flat dom
|
7 years ago |
|
ansuz
|
02cd7e5b58
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
69890ebd8f
|
prototype alternate datastructure for trees in listmap
|
7 years ago |
|
ansuz
|
23c305f71f
|
implement removeItem so localForage doesn't complain
|
7 years ago |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
7 years ago |
|
yflory
|
8251247da2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
7 years ago |
|
yflory
|
26c4bda4cd
|
Fix file upload in code and slide
|
7 years ago |
|
ansuz
|
98c66ef8f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
bf817f20ee
|
Fix file upload in code and slide
|
7 years ago |
|
ansuz
|
f031af4e9d
|
fix broken media-tags in contacts
|
7 years ago |
|
ansuz
|
f52a46c5aa
|
add html2canvas dependency
|
7 years ago |
|
yflory
|
24572a40d2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
f4adbd980e
|
Thumbnails for the code app
|
7 years ago |
|
ansuz
|
ba97aa7ad2
|
allow file upload handler to create thumbnails for whiteboard
|
7 years ago |
|
ansuz
|
6157c57a4b
|
disable color palette when interface is not editable
|
7 years ago |
|
ansuz
|
8359902f6a
|
fix typo in poll
|
7 years ago |
|
ansuz
|
69f9a7ebf3
|
make userlist change notifications configurable
|
7 years ago |
|
Caleb James DeLisle
|
027b9fa383
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
aa37997aa3
|
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
|
7 years ago |
|
ansuz
|
bac608adfe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
dc90811090
|
only call onReady once in sframe-listmap
|
7 years ago |
|
yflory
|
bac10472f3
|
lint compliance
|
7 years ago |
|
yflory
|
39b4cb9226
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
18b5b20d27
|
Add thumbnails for PDFs
|
7 years ago |
|
ansuz
|
aee51f1317
|
lint compliance
|
7 years ago |
|
ansuz
|
447b0a74ee
|
handle errors for videos when uploading
|
7 years ago |
|
yflory
|
30a69fae13
|
Add thumbnails for videos
|
7 years ago |
|
yflory
|
21f8ae7570
|
Keep the correct ratio for image thumbnails
|
7 years ago |
|
yflory
|
2dd3c42fd5
|
Fix handlers registered again on reconnect in drive and poll
|
7 years ago |
|
yflory
|
204f3e1441
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
a0bcb901d3
|
Add titles in poll when options or usernames are overflowing
|
7 years ago |
|
yflory
|
74985fd0f2
|
Use text for the addUser button in polls
|
7 years ago |
|
ansuz
|
7d1892546b
|
add missing french translation
|
7 years ago |
|
ansuz
|
6db5a34323
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
c17fc2efe7
|
improve option order in poll
|
7 years ago |
|
yflory
|
2be22867c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
13718d0263
|
Fix recent pads in chrome
|
7 years ago |
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
de8339fea7
|
hide alertify when you are in presentation mode
|
7 years ago |
|
ansuz
|
aaef30f489
|
bump cryptpad version
|
7 years ago |
|
Caleb James DeLisle
|
9b02b36724
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |