73d5ea967b
Fix an error created by the merge
2016-09-22 16:34:06 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
2016-09-21 15:03:36 +02:00
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
a9e2ca8d72
make tests green again
2016-09-20 23:31:29 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
e6785b4dad
push /pad/ state once ready to avoid OT collision
2016-09-20 16:35:55 +02:00
bf8c9a2c4b
Add a button to get the read only URL
2016-09-20 11:35:57 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
6363d3fb90
Pad titles are now shared with the userdoc
2016-09-16 12:49:47 +02:00
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
7c5ee53e81
resolve conflict and merge
2016-08-25 18:01:03 +02:00
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
e386749e89
unlock the editor after your name has been set (or not)
2016-08-25 11:36:20 +02:00
2d5caf38d9
show a spinner until the document has loaded
2016-08-04 17:00:30 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
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
4833cf0d7b
add a fontpicker
2016-07-28 09:24:14 +02:00
6cb2f72aa6
pretty print html during export if possible
2016-07-27 11:38:25 +02:00
fe3f02f5e0
enable text foreground and background colors
2016-07-25 15:38:59 +02:00
992bc4f449
add missing script
2016-07-25 11:09:25 +02:00
a995f2306d
fix undefined variable reference
2016-07-16 12:42:23 +02:00
44fe95c76b
add titles to buttons on pad and code
2016-07-16 12:38:21 +02:00
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
18ce69b756
use constants from toolbar.js, address linter warnings
2016-07-08 16:52:49 +02:00
a2a8570453
use alertify UI in /pad/
2016-07-07 12:47:56 +02:00
85702f2706
inform users of changes in /pad/ too
2016-07-06 22:19:22 +02:00
7e8d66a141
filter unwanted elements when receiving patches
2016-07-06 14:51:34 +02:00
d844551fba
add a forget button. clean up toolbar a bit
2016-06-30 17:24:25 +02:00
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
a3da10766a
add rename button to /code/ and /pad/
2016-06-30 10:51:19 +02:00
908e79c0b9
add autolink plugin
2016-06-28 12:09:43 +02:00
d025d13295
address some jshint complaints
2016-06-23 16:44:20 +02:00
31aa09d6f6
work a bit more on import/export and code highlighting
2016-06-22 20:58:50 +02:00
242c9a99e3
implement import and export in /pad/
2016-06-22 17:00:07 +02:00
1526c26f8e
remember code and wysiwyg pads
2016-06-21 18:49:37 +02:00
849683d586
update to use new style crypto module
2016-06-21 15:17:09 +02:00
69f3f4c9a8
drop hyperscript dependency
2016-06-20 18:39:13 +02:00
f818d873bb
remove usernames, refactor a wee bit
2016-06-16 16:20:51 +02:00
36baf498ce
fix magicline filter and strange interaction with cursor
2016-06-16 12:59:40 +02:00
303e8d6c3e
remove debugging line
2016-06-10 17:03:54 +02:00
8af49698da
add a class to the magicline markup so it's easier to remove
2016-06-10 09:56:40 +02:00
beba78d7f8
update prototype dependencies
2016-06-06 12:14:07 +02:00
ff0f7d15dc
use json-ot from bower
2016-06-03 16:23:25 +02:00
68cec2348a
don't prompt the user with a crypto hash for their name
2016-06-02 16:56:01 +02:00
a0ec5eada8
better fix for magicline filter
2016-05-31 12:51:04 +02:00
yflory