yflory
|
bc73fa2074
|
Merge branch 'fontawesome' into soon
|
2016-09-29 14:52:48 +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
|
a266f0bee1
|
query parameter for messages
|
2016-09-27 11:01:32 +02:00 |
|
yflory
|
c16e8d603b
|
Enable reconnecting websocket in code pad
|
2016-09-26 16:06:23 +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
|
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
|
47e8be1681
|
Remove the IMPORT button and editor toolbars in read-only mode
|
2016-09-21 15:03:36 +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
|
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
|
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 |
|
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 |
|
yflory
|
5c63585952
|
Complete the French translation
|
2016-09-15 18:35:09 +02:00 |
|
yflory
|
0d9f63b977
|
Merge branch 'translations' - part one
|
2016-09-15 10:36:05 +02:00 |
|
yflory
|
f086492e50
|
Improve the localization system
Improve and enable the French translation
|
2016-09-14 18:08:52 +02:00 |
|
ansuz
|
cc4bca8004
|
execute callbacks on presentation events
|
2016-09-14 16:03:52 +02:00 |
|
ansuz
|
8bf79ef915
|
serialize slide pads as a sorted object
|
2016-09-14 16:02:57 +02:00 |
|
ansuz
|
997b46a3f7
|
limit the size of rendered images
|
2016-09-14 16:02:20 +02:00 |
|
yflory
|
25c8d16bf5
|
Use a new version-prefixed hash parser
|
2016-09-13 17:43:56 +02:00 |
|
yflory
|
c736caceba
|
Use a better default pad title
|
2016-09-13 12:24:06 +02:00 |
|
ansuz
|
97415d8158
|
Merge branch 'users'
|
2016-09-01 17:38:25 +02:00 |
|
ansuz
|
122a9fe068
|
realtime kanban board
|
2016-09-01 16:23:40 +02:00 |
|
ansuz
|
4561ddcdf3
|
add missing semicolon
|
2016-09-01 16:13:25 +02:00 |
|
ansuz
|
8031770f90
|
rename "module" to "APP" in /slide/ for jshint
|
2016-09-01 16:12:22 +02:00 |
|
ansuz
|
8e86be81b2
|
Merge branch 'better-slides'
|
2016-09-01 16:01:21 +02:00 |
|
ansuz
|
fb21b4e46b
|
fix up /render/
|
2016-09-01 15:54:21 +02:00 |
|
ansuz
|
4941c1493e
|
better user integration. a few more common utils
|
2016-09-01 12:15:30 +02:00 |
|
ansuz
|
2f2aeef0e5
|
add missing semicolon
|
2016-09-01 12:06:21 +02:00 |
|
ansuz
|
8a659cf887
|
maintain aspect ratio for slides
display index and slide count in title
|
2016-09-01 12:03:09 +02:00 |