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
5e76194262
use new config api
2016-10-03 19:28:36 +02:00
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
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
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
a82b7aaf8b
allow empty names
2016-09-23 16:06:46 +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
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
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
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
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
ansuz
7c5ee53e81
resolve conflict and merge
2016-08-25 18:01:03 +02:00
ansuz
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
yflory
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
ansuz
e386749e89
unlock the editor after your name has been set (or not)
2016-08-25 11:36:20 +02:00
ansuz
2d5caf38d9
show a spinner until the document has loaded
2016-08-04 17:00:30 +02:00
ansuz
fd0a7337a3
wait a full minute until requirejs times out
2016-08-04 12:44:27 +02:00
ansuz
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
ansuz
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
ansuz
4833cf0d7b
add a fontpicker
2016-07-28 09:24:14 +02:00
ansuz
6cb2f72aa6
pretty print html during export if possible
2016-07-27 11:38:25 +02:00
ansuz
fe3f02f5e0
enable text foreground and background colors
2016-07-25 15:38:59 +02:00
ansuz
992bc4f449
add missing script
2016-07-25 11:09:25 +02:00
ansuz
a995f2306d
fix undefined variable reference
2016-07-16 12:42:23 +02:00
ansuz
44fe95c76b
add titles to buttons on pad and code
2016-07-16 12:38:21 +02:00
ansuz
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
ansuz
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
ansuz
18ce69b756
use constants from toolbar.js, address linter warnings
2016-07-08 16:52:49 +02:00
ansuz
750731d3db
workaround for favicon magic
2016-07-07 14:03:06 +02:00
ansuz
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +02:00
ansuz
a2a8570453
use alertify UI in /pad/
2016-07-07 12:47:56 +02:00
ansuz
85702f2706
inform users of changes in /pad/ too
2016-07-06 22:19:22 +02:00
