7c5ee53e81
resolve conflict and merge
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
e386749e89
unlock the editor after your name has been set (or not)
8 years ago
2d5caf38d9
show a spinner until the document has loaded
8 years ago
fd0a7337a3
wait a full minute until requirejs times out
8 years ago
600f3151e9
don't use the store until it's ready to be used
8 years ago
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
8 years ago
4833cf0d7b
add a fontpicker
8 years ago
6cb2f72aa6
pretty print html during export if possible
8 years ago
fe3f02f5e0
enable text foreground and background colors
8 years ago
992bc4f449
add missing script
8 years ago
a995f2306d
fix undefined variable reference
8 years ago
44fe95c76b
add titles to buttons on pad and code
8 years ago
d39ab5c250
point to the actual translation file
8 years ago
3eccec7054
better effort for translation
8 years ago
18ce69b756
use constants from toolbar.js, address linter warnings
9 years ago
750731d3db
workaround for favicon magic
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
a2a8570453
use alertify UI in /pad/
9 years ago
85702f2706
inform users of changes in /pad/ too
9 years ago
6075849ed7
add favicons to /pad/ and /code/
9 years ago
7e8d66a141
filter unwanted elements when receiving patches
9 years ago
d844551fba
add a forget button. clean up toolbar a bit
9 years ago
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
9 years ago
a3da10766a
add rename button to /code/ and /pad/
9 years ago
908e79c0b9
add autolink plugin
9 years ago
d025d13295
address some jshint complaints
9 years ago
31aa09d6f6
work a bit more on import/export and code highlighting
9 years ago
242c9a99e3
implement import and export in /pad/
9 years ago
1526c26f8e
remember code and wysiwyg pads
9 years ago
849683d586
update to use new style crypto module
9 years ago
69f3f4c9a8
drop hyperscript dependency
9 years ago
f818d873bb
remove usernames, refactor a wee bit
9 years ago
36baf498ce
fix magicline filter and strange interaction with cursor
9 years ago
303e8d6c3e
remove debugging line
9 years ago
8af49698da
add a class to the magicline markup so it's easier to remove
9 years ago
beba78d7f8
update prototype dependencies
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
68cec2348a
don't prompt the user with a crypto hash for their name
9 years ago
a0ec5eada8
better fix for magicline filter
9 years ago
e3b8a10959
fix magicline filter
9 years ago
297d8c2d44
reformat code for jshint compliance
9 years ago
0c89443c1b
fix typo
9 years ago
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
9 years ago
ad3c53c344
use textpatcher from bower for all pads
9 years ago
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
9 years ago
1769ca16dc
add example for configuring the logLevel in /pad/
9 years ago
d2fa5e8f70
start using hyperjson from bower.io
9 years ago
506a703b7d
turn off TextPatcher logging on /pad/
9 years ago
ansuz