8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
a220742f68
fix reversed color settings
2016-12-16 15:31:22 +01:00
308db7fa79
fix uncolored /pad/ content in IE
2016-12-16 15:25:06 +01:00
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:03:00 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
de0863e232
use new ot
2016-12-06 16:22:42 +01:00
4cd9bd5534
strip listeners
2016-12-06 16:21:11 +01:00
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
2016-11-07 15:08:49 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
d009b7400c
fall back to default title if one is not suggested
2016-11-07 12:29:57 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
3de4e5709b
Clean the code
2016-10-26 17:50:59 +02:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
46c5f64369
remove absent users from the userlist
2016-10-19 12:30:25 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
e739c49e7f
Remove the 'about' button in ckeditor
2016-10-11 11:57:07 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
5e76194262
use new config api
2016-10-03 19:28:36 +02:00
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
bc73fa2074
Merge branch 'fontawesome' into soon
2016-09-29 14:52:48 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
2016-09-28 09:01:33 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
a266f0bee1
query parameter for messages
2016-09-27 11:01:32 +02:00
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
2016-09-23 16:40:07 +02:00
a82b7aaf8b
allow empty names
2016-09-23 16:06:46 +02:00
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
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
fd0a7337a3
wait a full minute until requirejs times out
2016-08-04 12:44:27 +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
750731d3db
workaround for favicon magic
2016-07-07 14:03:06 +02:00
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +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
6075849ed7
add favicons to /pad/ and /code/
2016-07-06 22:17:18 +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
e3b8a10959
fix magicline filter
2016-05-30 17:33:24 +02:00
297d8c2d44
reformat code for jshint compliance
2016-05-20 13:39:40 +02:00
0c89443c1b
fix typo
2016-05-17 17:22:18 +02:00
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
2016-05-17 16:57:50 +02:00
ad3c53c344
use textpatcher from bower for all pads
2016-05-13 17:32:56 +02:00
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
2016-05-12 18:21:01 +02:00
1769ca16dc
add example for configuring the logLevel in /pad/
2016-05-10 10:23:22 +02:00
d2fa5e8f70
start using hyperjson from bower.io
2016-05-09 11:41:02 +02:00
506a703b7d
turn off TextPatcher logging on /pad/
2016-04-27 15:42:27 +02:00
32d1807350
import unused functions from /p/, to be integrated later
2016-04-27 12:25:19 +02:00
626ecaffcd
log browser fights in /pad/
2016-04-27 11:10:31 +02:00
53b2644b64
Fix a issue with fights over usernames
2016-04-26 17:16:58 +02:00
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
2016-04-25 15:29:09 +02:00
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
2016-04-22 14:26:37 +02:00
4c95602347
remove a little bit more dead code
2016-04-22 09:46:41 +02:00
cce50390a0
don't depend on library to set hash
2016-04-21 19:04:15 +02:00
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
ecc41d14af
Use canonical serializer for json serialization
2016-04-13 17:46:41 +02:00
9683fd9aec
Always serialize the DOM in one way.
2016-04-13 16:46:31 +02:00
f75c246029
remove dead code from pad/main.js
2016-04-12 17:17:14 +02:00
a0999d1d2b
add a comment about why hashes are being stubbed
2016-04-12 15:36:03 +02:00
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
2016-04-12 14:51:32 +02:00
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
2016-04-12 14:34:47 +02:00
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
2016-04-08 16:54:03 +02:00
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
2016-04-01 17:58:33 +02:00
de6db0285c
Limit the size of the usernames to 32 chars
2016-03-16 17:48:27 +01:00
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
3cb94b8d80
jshint compliance
2016-02-15 16:07:46 +01:00
f1915d3b7c
fix jshint complaints in pad directory
2016-02-12 16:21:17 +01:00
967d636df9
address more jshint complaints
2016-02-12 11:39:37 +01:00
c71b060dc2
main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time.
2016-01-14 05:14:45 -05:00
51544db9a2
Completed adding of customization system and bottom infobar
2015-02-02 16:01:33 +01:00
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
2015-01-30 16:52:23 +01:00
c13bfe978a
Switched cryptpad to use common/toolbar.js which is shared with cryptsheet
2015-01-30 11:10:51 +01:00
50c10f818e
Added cryptsheet to cryptpad suite!
2015-01-29 17:55:18 +01:00
ansuz