ansuz
|
3ea270acb9
|
fix cursors in form prototype
|
2016-05-13 16:41:36 +02:00 |
|
ansuz
|
d2c8fbf1f8
|
use hyperjson.amd.js, not hyperjson.js
|
2016-05-12 18:21:01 +02:00 |
|
ansuz
|
663c157e2a
|
expose text patcher to the window via APP
|
2016-05-12 10:46:17 +02:00 |
|
ansuz
|
1769ca16dc
|
add example for configuring the logLevel in /pad/
|
2016-05-10 10:23:22 +02:00 |
|
ansuz
|
7faf57602b
|
implement log level settings from application layer
|
2016-05-10 09:39:20 +02:00 |
|
ansuz
|
523aff3067
|
use upstream chainpad.js
|
2016-05-09 15:50:19 +02:00 |
|
ansuz
|
dcd130cd9d
|
use hyperjson from bower in padrtc
|
2016-05-09 15:27:37 +02:00 |
|
ansuz
|
c752e4a6e5
|
remove sharejs
|
2016-05-09 14:20:11 +02:00 |
|
ansuz
|
6b2e986789
|
remove deprecated textsocket library
|
2016-05-09 11:57:40 +02:00 |
|
ansuz
|
d2fa5e8f70
|
start using hyperjson from bower.io
|
2016-05-09 11:41:02 +02:00 |
|
ansuz
|
150ebaba7b
|
add ability to force text diffing
|
2016-04-27 17:58:55 +02:00 |
|
ansuz
|
aef6f3a85b
|
lock codemirror editor until chain has synced
|
2016-04-27 16:21:10 +02:00 |
|
ansuz
|
6736335db2
|
add 'made with <3' toolbar to code
|
2016-04-27 15:43:31 +02:00 |
|
ansuz
|
506a703b7d
|
turn off TextPatcher logging on /pad/
|
2016-04-27 15:42:27 +02:00 |
|
ansuz
|
ba17b78f7a
|
restyle name change button
|
2016-04-27 15:32:58 +02:00 |
|
ansuz
|
d79b3616c9
|
remove unused files
|
2016-04-27 15:32:15 +02:00 |
|
ansuz
|
4c84758265
|
disable textpatcher logging
|
2016-04-27 15:30:53 +02:00 |
|
ansuz
|
46b009d20f
|
remove last non-netflux pad
|
2016-04-27 12:30:43 +02:00 |
|
ansuz
|
18e0131d6e
|
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-27 12:28:24 +02:00 |
|
ansuz
|
32d1807350
|
import unused functions from /p/, to be integrated later
|
2016-04-27 12:25:19 +02:00 |
|
Yann Flory
|
492054a938
|
Fix the cursor position when a remote patch is applied
|
2016-04-27 12:17:06 +02:00 |
|
ansuz
|
626ecaffcd
|
log browser fights in /pad/
|
2016-04-27 11:10:31 +02:00 |
|
Yann Flory
|
5bb2e12db2
|
Merge branch 'beta' into migrate
|
2016-04-27 10:51:51 +02:00 |
|
ansuz
|
afe78dad56
|
Merge branch 'netflux' into beta
|
2016-04-27 10:44:32 +02:00 |
|
Yann Flory
|
cc51e6d6ed
|
Update CodeMirror pad to work with Netflux
|
2016-04-27 10:44:04 +02:00 |
|
ansuz
|
a735d63306
|
migrate markdown rendering 'pad' to netflux
|
2016-04-27 10:38:44 +02:00 |
|
Yann Flory
|
f5f8f6e1eb
|
Remove the delay between a change and its propagation to chainpad
|
2016-04-26 17:50:54 +02:00 |
|
ansuz
|
fa6914037c
|
start rewriting codepad to use realtime-input
|
2016-04-26 17:34:57 +02:00 |
|
ansuz
|
2852c8f594
|
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-26 17:24:51 +02:00 |
|
Yann Flory
|
fe3bb4da27
|
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
|
2016-04-26 17:18:31 +02:00 |
|
Yann Flory
|
53b2644b64
|
Fix a issue with fights over usernames
|
2016-04-26 17:16:58 +02:00 |
|
Caleb James DeLisle
|
3b6fe44378
|
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-26 14:31:57 +02:00 |
|
ansuz
|
255dc17a5d
|
Merge branch 'beta' into netflux
|
2016-04-25 16:08:00 +02:00 |
|
ansuz
|
f9de1c9e1f
|
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-25 16:07:24 +02:00 |
|
ansuz
|
c14b86d84a
|
add missing semicolon
|
2016-04-25 16:07:02 +02:00 |
|
ansuz
|
b3ef2abb84
|
fix jshint complain
|
2016-04-25 16:06:10 +02:00 |
|
Yann Flory
|
85d5f5c47f
|
Convert netflux to es5
|
2016-04-25 15:29:39 +02:00 |
|
Yann Flory
|
c0b8aac792
|
Fix an issue where metadata could be duplicated in the realtime userdoc
|
2016-04-25 15:29:09 +02:00 |
|
ansuz
|
22cf18f78c
|
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
|
2016-04-23 16:31:35 +02:00 |
|
ansuz
|
c509c28c18
|
realtime form prototype, almost in good condition
|
2016-04-23 16:31:07 +02:00 |
|
ansuz
|
1a9e7299fc
|
working state
|
2016-04-23 00:15:39 +02:00 |
|
ansuz
|
69e8f54e8f
|
pass in Crypto to realtime-input
|
2016-04-22 18:54:24 +02:00 |
|
Caleb James DeLisle
|
5f16ad4a58
|
Update to most recent chainpad
|
2016-04-22 18:17:00 +02:00 |
|
ansuz
|
aa07dd31ee
|
have json-ot initialize its own debug module, instead of relying on a window variable's existence
|
2016-04-22 17:35:07 +02:00 |
|
Yann Flory
|
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 |
|
Yann Flory
|
8ac69ca262
|
Add a missing "time" property in the netflux client causing incorrect
timeout errors
|
2016-04-22 11:46:27 +02:00 |
|
ansuz
|
be1ef7abe3
|
migrate canvas to netflux
|
2016-04-22 10:04:54 +02:00 |
|
ansuz
|
d4943511fe
|
move text/ and hack/ to Netflux
|
2016-04-22 09:47:26 +02:00 |
|
ansuz
|
4c95602347
|
remove a little bit more dead code
|
2016-04-22 09:46:41 +02:00 |
|
ansuz
|
b140b6429d
|
remove a little bit of dead code
|
2016-04-22 09:46:06 +02:00 |