Commit graph

946 commits

Author SHA1 Message Date
yflory
76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23: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
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
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