dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,513 Commits 74 Branches 132 Tags 560 MiB
Commit Graph

3513 Commits

Author SHA1 Message Date
yflory 887a26b1a6 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 17:34:47 +02:00
Caleb James DeLisle 0b34ceb0eb Added RPC setPadTitleInDrive() 2017-08-17 17:34:08 +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
yflory 25466aa2f9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 17:26:27 +02:00
yflory 1d237735ef Useradmin menu in pad2 2017-08-17 17:26:20 +02:00
Caleb James DeLisle 3b5af3ea74 sframe common changes 2017-08-17 16:56:18 +02:00
yflory d1157c4d72 Add missing file 2017-08-17 16:28:54 +02:00
yflory d237c76f6c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 16:25:31 +02:00
yflory f5855a2870 Add account name in metadata manager 2017-08-17 16:25:25 +02:00
Caleb James DeLisle 3c0197cbf4 Firefox fails to boot the iframe if there is no number on setInterval 2017-08-17 16:17:57 +02:00
yflory d88704fb50 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 15:44:41 +02:00
Caleb James DeLisle a4850a7fcc Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 15:42:28 +02:00
yflory fc5bdd3bed Add lazy metadata to fix parse errors in pad2 2017-08-17 15:42:26 +02:00
Caleb James DeLisle ad9f2ff223 Made pad2 server more generic and easy to implement 2017-08-17 15:41:04 +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
yflory 226ef1fd00 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-17 14:55:53 +02:00
yflory fb512c8923 Toolbar in pad2 2017-08-17 14:55:44 +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
Caleb James DeLisle e04c0b89a1 manual merge of staging 2017-08-17 12:14:19 +02:00
Caleb James DeLisle 4881f8d030 Remove X-Frame-Options because it cannot work with a cross-domain iframe. 2017-08-17 12:12:40 +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