dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
965 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

965 Commits

Author SHA1 Message Date
yflory a989b51d74 Fix race conditions with Alertify 2016-10-05 16:04:21 +02:00
yflory 74df38f94f Fix race conditions that could prevent applications from being loaded 2016-10-05 11:19:18 +02:00
ansuz 7d5a33512a enable slide application listing on home page by default 2016-10-04 17:15:09 +02:00
ansuz a28daf2715 use websocket url configuration api 2016-10-04 17:13:15 +02:00
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
ansuz 2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz 61dfca33a3 resolve conflict and merge 'newserver' 2016-10-04 12:43:14 +02:00
ansuz ee88e96baf merge noscript 2016-10-04 11:42:06 +02:00
ansuz 11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title 2016-10-04 11:23:04 +02:00
ansuz e1512a4063 Merge branch 'safe-sockets' into soon 2016-10-04 10:59:09 +02:00
ansuz 5e76194262 use new config api 2016-10-03 19:28:36 +02:00
ansuz 0ece2cf6a1 add to default configuration and comment 2016-10-03 19:28:14 +02:00
ansuz 3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory 76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory 1c808b3da8 Add comment for the 'important' css rule 2016-10-03 16:09:59 +02:00
yflory 17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
ansuz 9fa7da60b9 confirm that a socket is ready to send before sending 2016-10-03 15:38:42 +02:00
yflory 0f672f19f5 Merge branch 'slide' into soon 2016-10-03 14:31:58 +02:00
yflory 391728ee6d Use CodeMirror in /slide #2 
Fix title errors in the slide app caused by the present mode
 2016-10-03 14:21:39 +02:00
yflory 8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
Yann Flory 2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
ansuz 4b238de84c quieter stdout and stderr logs 2016-09-30 15:51:23 +02:00
yflory b5b0eacebc Remove the old (non-bower) codemirror 2016-09-29 16:24:26 +02:00
yflory 261d2fecbc Get codemirror from bower and use that version in the code app 2016-09-29 16:23:27 +02:00
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 ebae2c3bec Fix the noscript tag 2016-09-29 11:09:06 +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