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

937 Commits

Author SHA1 Message Date
yflory bc73fa2074 Merge branch 'fontawesome' into soon 2016-09-29 14:52:48 +02:00
ansuz 921ee128bc deobfuscate email 2016-09-29 14:46:32 +02:00
yflory f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
ansuz 0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome 2016-09-28 09:01:33 +02:00
yflory 3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz f8b65be009 Merge pull request #39 from ochronus/fix-content-type 
Using express.static instead of custom handler
 2016-09-27 12:19:08 +02:00
Csaba Okrona c82abd8780 reverting the style changes 2016-09-27 12:17:38 +02:00
Csaba Okrona 08064ae035 Using express.static instead of custom handler 2016-09-27 11:53:52 +02:00
ansuz a266f0bee1 query parameter for messages 2016-09-27 11:01:32 +02:00
yflory 07434eb4c4 Merge branch 'less' 2016-09-26 17:35:51 +02:00
yflory 1ac94105bb Update the src of customized elements 2016-09-26 17:35:27 +02:00
ansuz 4f5a5251d6 add note about nvm in readme 2016-09-26 16:14:45 +02:00
yflory c16e8d603b Enable reconnecting websocket in code pad 2016-09-26 16:06:23 +02:00
ansuz 6315915b5d Merge branch 'newhashNoConflict' into merge-hash 2016-09-26 13:55:10 +02:00
Caleb James DeLisle 038a986e83 Fix path for file storage on windows 2016-09-26 12:17:32 +02:00
ansuz d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
ansuz ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName 2016-09-23 16:40:07 +02:00
ansuz a4843cb5d7 Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict 2016-09-23 16:07:46 +02:00
ansuz a82b7aaf8b allow empty names 2016-09-23 16:06:46 +02:00
yflory 37c3f12790 Use the new end_of_history message 2016-09-23 15:37:12 +02:00
yflory 2267ec8c43 Slides in read-only were not updated with the latest content 2016-09-23 15:12:17 +02:00
Yann Flory eac0cdd6dd Enable read-only mode in slides 2016-09-23 12:26:06 +02:00
yflory d46bd1af5c Improve the toolbar UI with the username displayed 2016-09-22 17:56:51 +02:00
yflory 79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory 73d5ea967b Fix an error created by the merge 2016-09-22 16:34:06 +02:00
yflory dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
yflory 99004428d5 Enable the read-only mode in Cryptpoll 2016-09-22 16:09:20 +02:00
yflory ad32ea2a82 Store the validate key in the history keeper database 2016-09-21 17:24:12 +02:00
yflory 47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode 2016-09-21 15:03:36 +02:00
yflory 7cc5218422 Messages are now verified by the users instead of the server 2016-09-21 15:02:50 +02:00
ansuz f6372ee803 add noreferrer attr to blank links as well 2016-09-21 15:02:08 +02:00
ansuz c50a0ac579 where target=blank, rel=noopener 2016-09-21 14:49:47 +02:00
ansuz f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
ansuz a9e2ca8d72 make tests green again 2016-09-20 23:31:29 +02:00
yflory 83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz e6785b4dad push /pad/ state once ready to avoid OT collision 2016-09-20 16:35:55 +02:00
ansuz 723df4880e Merge branch 'slides' into merge-slides 2016-09-20 16:28:36 +02:00
ansuz b96f050555 Merge branch 'board' into merge-boards 2016-09-20 16:26:31 +02:00
ansuz fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
ansuz 259896a373 fix translation fragment in English messages file 2016-09-20 16:21:40 +02:00
ansuz 2d42cadb23 push /code/ state once ready to avoid OT collision 2016-09-20 15:14:53 +02:00
ansuz bf5dac58dd Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc 2016-09-20 14:13:35 +02:00
Yann Flory 202925302e Display a indicator for read-only pads in the main page 2016-09-20 11:59:13 +02:00
Yann Flory bf8c9a2c4b Add a button to get the read only URL 2016-09-20 11:35:57 +02:00
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +02:00
Yann Flory 42f14873cd Merge branch 'translations' into newhashmerge 2016-09-19 14:53:40 +02:00
Yann Flory 391b7690e6 Set the pad to readonly mode when using a 'view' url 2016-09-19 14:52:36 +02:00
ansuz 138d7e0a25 Merge branch 'translations' 2016-09-16 21:55:01 +02:00
Yann Flory 368e253c9f Ability to send a read-only URL 2016-09-16 18:45:40 +02:00
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc 2016-09-16 12:49:47 +02:00