ansuz
|
dbc8f01b8b
|
fix merge errors and reach full jshint compliance
|
8 years ago |
|
yflory
|
a30e17121d
|
Merge branch 'readonlyButton' into soon
|
8 years ago |
|
yflory
|
e84a54556c
|
Move the toolbar buttons' events handlers in cryptpad-common
|
8 years ago |
|
ansuz
|
2ac1b02572
|
Merge branch 'config-sockets' into soon
|
8 years ago |
|
ansuz
|
61dfca33a3
|
resolve conflict and merge 'newserver'
|
8 years ago |
|
ansuz
|
ee88e96baf
|
merge noscript
|
8 years ago |
|
ansuz
|
11f63c861c
|
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
|
8 years ago |
|
ansuz
|
e1512a4063
|
Merge branch 'safe-sockets' into soon
|
8 years ago |
|
ansuz
|
5e76194262
|
use new config api
|
8 years ago |
|
ansuz
|
0ece2cf6a1
|
add to default configuration and comment
|
8 years ago |
|
ansuz
|
3dfa19b786
|
more flexible websocket configuration (WIP)
|
8 years ago |
|
yflory
|
76fdadee7f
|
Store only the strongest hash in the localstorage
|
8 years ago |
|
yflory
|
1c808b3da8
|
Add comment for the 'important' css rule
|
8 years ago |
|
yflory
|
17b4f91810
|
Do not share the title in the doc if it is the default title
|
8 years ago |
|
ansuz
|
9fa7da60b9
|
confirm that a socket is ready to send before sending
|
8 years ago |
|
yflory
|
0f672f19f5
|
Merge branch 'slide' into soon
|
8 years ago |
|
yflory
|
391728ee6d
|
Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
|
8 years ago |
|
yflory
|
8c33218ceb
|
Move the codemirror themes in /common
|
8 years ago |
|
Yann Flory
|
2609af2105
|
Use the CodeMirror editor in the slide application
|
8 years ago |
|
ansuz
|
4b238de84c
|
quieter stdout and stderr logs
|
8 years ago |
|
yflory
|
b5b0eacebc
|
Remove the old (non-bower) codemirror
|
8 years ago |
|
yflory
|
261d2fecbc
|
Get codemirror from bower and use that version in the code app
|
8 years ago |
|
yflory
|
bc73fa2074
|
Merge branch 'fontawesome' into soon
|
8 years ago |
|
ansuz
|
921ee128bc
|
deobfuscate email
|
8 years ago |
|
yflory
|
ebae2c3bec
|
Fix the noscript tag
|
8 years ago |
|
yflory
|
f03018f3bc
|
Improve the top bar and use the font awesome icons in /code
|
8 years ago |
|
ansuz
|
0be8c333e0
|
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
|
8 years ago |
|
yflory
|
3d54413343
|
Improve the UI with FontAwesome icons
|
8 years ago |
|
ansuz
|
f8b65be009
|
Merge pull request #39 from ochronus/fix-content-type
Using express.static instead of custom handler
|
8 years ago |
|
Csaba Okrona
|
c82abd8780
|
reverting the style changes
|
8 years ago |
|
Csaba Okrona
|
08064ae035
|
Using express.static instead of custom handler
|
8 years ago |
|
ansuz
|
a266f0bee1
|
query parameter for messages
|
8 years ago |
|
yflory
|
07434eb4c4
|
Merge branch 'less'
|
8 years ago |
|
yflory
|
1ac94105bb
|
Update the src of customized elements
|
8 years ago |
|
ansuz
|
4f5a5251d6
|
add note about nvm in readme
|
8 years ago |
|
yflory
|
c16e8d603b
|
Enable reconnecting websocket in code pad
|
8 years ago |
|
ansuz
|
6315915b5d
|
Merge branch 'newhashNoConflict' into merge-hash
|
8 years ago |
|
Caleb James DeLisle
|
038a986e83
|
Fix path for file storage on windows
|
8 years ago |
|
ansuz
|
d6525087c7
|
jshint compliancy
|
8 years ago |
|
ansuz
|
ed9acf1c00
|
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
|
8 years ago |
|
ansuz
|
a4843cb5d7
|
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
|
8 years ago |
|
ansuz
|
a82b7aaf8b
|
allow empty names
|
8 years ago |
|
yflory
|
37c3f12790
|
Use the new end_of_history message
|
8 years ago |
|
yflory
|
2267ec8c43
|
Slides in read-only were not updated with the latest content
|
8 years ago |
|
Yann Flory
|
eac0cdd6dd
|
Enable read-only mode in slides
|
8 years ago |
|
yflory
|
d46bd1af5c
|
Improve the toolbar UI with the username displayed
|
8 years ago |
|
yflory
|
79884e2400
|
Use the same username for all pads
|
8 years ago |
|
yflory
|
73d5ea967b
|
Fix an error created by the merge
|
8 years ago |
|
yflory
|
dde519795d
|
Merge branch 'newhash' into newhashNoConflict
|
8 years ago |
|
yflory
|
99004428d5
|
Enable the read-only mode in Cryptpoll
|
8 years ago |