Commit graph

3437 commits

Author SHA1 Message Date
ansuz
0693a98890 create a thumbnail when uploading images from whiteboard 2017-08-18 12:53:02 +02:00
ansuz
b17044ad98 add support for thumbnails in metadata 2017-08-18 12:47:04 +02:00
ansuz
a5cd915b06 Merge pull request #170 from pbondoer/caps
Use CryptPad everywhere instead of Cryptpad in titles
2017-08-18 10:10:52 +02:00
Pierre Bondoerffer
5e22e1dc59
use CryptPad instead of Cryptpad in titles 2017-08-17 20:47:39 +02:00
ansuz
a4dbf39c4a fix pdf display problems in chrome 2017-08-17 18:11:46 +02:00
ansuz
bed7d95bf3 use latest compiled cryptpad media-tag 2017-08-17 17:31:52 +02:00
ansuz
4e62f79594 stop referring to deleted file as background image 2017-08-17 17:31:18 +02:00
ansuz
3a5526e247 infer pdfjs document title from iframe url 2017-08-17 17:30:28 +02:00
ansuz
a125253cde lint compliance 2017-08-17 15:13:05 +02:00
ansuz
290763d6c5 don't complain about bad realtime state just because you disconnected 2017-08-17 15:07:34 +02:00
ansuz
3b20dcd435 add optional cache-busting to favicon 2017-08-17 14:34:22 +02:00
ansuz
48fe3ef841 add a tip about cryptdrive 2017-08-17 14:25:24 +02:00
ansuz
839c6df3bb remove invalid loading screen tips. create a new one 2017-08-17 14:16:37 +02:00
ansuz
95404992da Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-17 12:51:58 +02:00
ansuz
ee874878dd clear tooltips when the userlist is redrawn 2017-08-17 12:50:40 +02:00
ansuz
f207edfd28 handle errors when deriving keys. fix incorrect reference 2017-08-17 12:50:12 +02:00
yflory
0a813b4fab Fix limit bar overflowing when over the limit 2017-08-17 10:24:10 +02:00
Caleb James DeLisle
3315449114 Lets try this... 2017-08-16 14:30:17 +02:00
Caleb James DeLisle
4c949a61e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:40:34 +02:00
Caleb James DeLisle
6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist. 2017-08-16 12:40:15 +02:00
yflory
e7ef1e1c2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:35:13 +02:00
yflory
7c49ca6e3f Fix initial text size in code 2017-08-16 12:34:56 +02:00
ansuz
2874ccb5dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:15:20 +02:00
ansuz
2a8abc2699 comment out splitter code 2017-08-16 12:15:08 +02:00
Caleb James DeLisle
e6cdf955d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:11:46 +02:00
Caleb James DeLisle
725e19925c Yeah, that was silly... 2017-08-16 12:11:25 +02:00
Caleb James DeLisle
f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:36:25 +02:00
Caleb James DeLisle
3df20760c4 Yann does not have a twitter account. 2017-08-16 11:36:14 +02:00
yflory
df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:35:56 +02:00
yflory
df0b7155f6 Add missing french translation 2017-08-16 11:35:40 +02:00
ansuz
46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:54 +02:00
ansuz
127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:35 +02:00
ansuz
8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:31:09 +02:00
ansuz
2b7dcbe77c remove bs class that caused poor alignment sometimes 2017-08-16 11:30:56 +02:00
Caleb James DeLisle
4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:29:59 +02:00
Caleb James DeLisle
d6125d864c Added Yann's bio 2017-08-16 11:29:50 +02:00
yflory
a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:17:37 +02:00
ansuz
9213aa7ee4 simplify example config 2017-08-16 11:02:03 +02:00
yflory
e4d842ed08 Fix typos in the french translation 2017-08-16 10:55:15 +02:00
ansuz
7537caf8fe make footer translateable 2017-08-16 10:51:08 +02:00
ansuz
bd45aeaa03 bump package.json version 2017-08-16 10:31:47 +02:00
ansuz
d3a298d639 Merge branch 'ui-integration' into staging 2017-08-16 10:20:34 +02:00
ansuz
8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +02:00
Caleb James DeLisle
40287f973c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 10:19:50 +02:00
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. 2017-08-16 10:19:24 +02:00
CatalinScr
fd3fd945c8 Updated the Log in Page 2017-08-16 07:56:18 +03:00
CatalinScr
1f4d0a0a56 Repaired a bug 2017-08-16 06:56:08 +03:00
CatalinScr
dd48cf7c90 updated the register page 2017-08-15 23:47:36 +03:00
CatalinScr
3196d4558f repaired the responsive error at about page 2017-08-15 06:50:13 +03:00
ansuz
9a6bf302b4 ignore ckeditor hacks 2017-08-14 18:12:05 +02:00