39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
d2389a5729
Change the userlist in the toolbar
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
8c33218ceb
Move the codemirror themes in /common
8 years ago
2609af2105
Use the CodeMirror editor in the slide application
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
d6525087c7
jshint compliancy
8 years ago
d46bd1af5c
Improve the toolbar UI with the username displayed
8 years ago
79884e2400
Use the same username for all pads
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
99b50465c7
Add the read-only mode for /pad and /code
8 years ago
42f14873cd
Merge branch 'translations' into newhashmerge
8 years ago
391b7690e6
Set the pad to readonly mode when using a 'view' url
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
8e86be81b2
Merge branch 'better-slides'
8 years ago
fb21b4e46b
fix up /render/
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
168338b898
add missing functions
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
8c914dfe1f
better filenames
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
9 years ago
5131f47cca
jshint compliance
9 years ago
306d524416
fix broken removal call
9 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
9 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
9 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
9 years ago
9a5294016d
fix incorrect usage of store api
9 years ago
4e5f381325
add spinner to API. update bower deps
9 years ago
fa654a7646
slightly better regex
9 years ago
cd18075ac7
add some redirection logic to support old hash types
9 years ago
600f3151e9
don't use the store until it's ready to be used
9 years ago
fffa9acf15
remove unused files from fs and jshintignore
9 years ago
551d38c930
let the abstraction take care of stringification
9 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
9 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
9 years ago
7f02c899ea
add snippet for copying text to the clipboard
9 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
9 years ago
c6bdb7506d
forget everything about a pad when you forget it
9 years ago
e84fbf0bc3
more helpers in common
9 years ago
ff74a67a09
translate alertify button messages
9 years ago
d39ab5c250
point to the actual translation file
9 years ago
dea8e225db
fix double scrollbar issue
9 years ago
3eccec7054
better effort for translation
9 years ago
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
9 years ago
7504f79e05
add log and warn methods to cryptpad common
9 years ago
3ad5d71ab1
make sure the regular favicon is set
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
589b0087a1
listen for keyup events while alertify prompts are active
9 years ago
deae7ac78f
don't hide the notification until it has been seen
9 years ago
3d3c6e4800
add wrappers for alertifyjs
9 years ago
73d2b6561a
add small modules for page visibility api and notification apis
9 years ago
d8b467422a
fix default title in localStorage migration
9 years ago
7a5877d12a
don't filter pads after 30 days
9 years ago
d844551fba
add a forget button. clean up toolbar a bit
9 years ago
8a82e11306
make sure title is defined for home page usage
9 years ago
71b1f71ba0
fix migration to include ctime
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
93dcf29c15
more functions for working with localstorage
9 years ago
d025d13295
address some jshint complaints
9 years ago
12bbf3e8f6
don't drop values onto the window
9 years ago
ca45e3533d
pass loaded file to callback when importing
9 years ago
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
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
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
9 years ago
c3d2568d3c
add file export for codepad
...
addresses #24
9 years ago
2b8c21d292
set styles with setAttribute. fixes style fights
9 years ago
1746a4e732
use crypto from bower
9 years ago
2a3ff256b9
remove libraries which are now in bower
9 years ago
f72cb24fc5
rm LORIA
9 years ago
2c3de49922
remove realtime-input, since it's in bower now
9 years ago
2798d1b1f9
all of the list/map api's dependencies are now on bower
9 years ago
58c968b319
minor cleanup in realtime-input
9 years ago
288b4d5b66
depend on main passing in the crypto module for now
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
9336c4de5c
import latest chainpad
9 years ago
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
9 years ago
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
cf85de6113
remove old bencoding code
9 years ago
d99bb8ff84
WIP : fallback to old parsing doesn't work
9 years ago
f04be53d11
fall back to old parsing if the message is bencoded?
9 years ago
976a08cc7a
move to chainpad version 2
9 years ago
cae750cd75
update padrtc for to use bower libraries
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
ba17b78f7a
restyle name change button
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
5f16ad4a58
Update to most recent chainpad
9 years ago
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
9 years ago
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
9 years ago
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
bbdc9da853
delete duplicated file
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
a18c793f98
use latest hyperjson
9 years ago
9efcc443cd
add 'format' to TextPatcher's API
9 years ago
0769e50414
move TextPatcher to highest application layer
9 years ago
1d70335228
provide all callbacks before starting
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
cb979844f6
implement text patching at application layer
9 years ago
4a41575e6d
accept onLocal in config
9 years ago
d3c2c901b6
implement cursor transformation in a common library
9 years ago
92d89f6cac
start to factor sharejs into two modules
9 years ago
13dc77b7f6
remove commented line
9 years ago
41e635b2e5
realtime-input.js : turn on logging
9 years ago
69e8e18283
Remove the pipe character in the hash
9 years ago
d62e9fc1c9
add a missing semicolon
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
f4c5b2a996
Add sane defaults to TextPatcher diffs
9 years ago
259772dd62
Turn on TextPatcher logging for _socket
9 years ago
0537c28919
Add switchable logging to TextPatcher.js
9 years ago
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
368d72b337
add missing semicolons to TextPatcher.js
9 years ago
851ccfbdb6
detect falsey operations in OT and ignore them
9 years ago
400f6efde1
json-ot.js : jshint compliance
9 years ago
ca94d30386
detect falsey operations in OT and ignore them
9 years ago
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
9 years ago
793149a608
json-ot.js : jshint compliance
9 years ago
06a3b63923
jshint compliance for toolbar.js
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
94e57e4a26
update location of text-patcher.js
9 years ago
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
39071021eb
stabilize typingTest.js as /common/TypingTests.js
9 years ago
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
9 years ago
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
9 years ago
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
9 years ago
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
9 years ago
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
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
9 years ago
cf9f60bd57
The server don't send back anymore messages to their sender
9 years ago
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
9 years ago
ba4faea939
Update the pads to run with the latest improvements to the websocket server
9 years ago
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
9 years ago
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
9 years ago
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
9 years ago
c50690349b
comments describing the role of each argument
9 years ago
96e03fcfa4
Use latest chainpad without mutations
9 years ago
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
9 years ago
6c340a6527
chainpad testing = true, reject non-compliant messages
9 years ago
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
9 years ago
bac0e0ff88
implement hyperjson filtering
9 years ago
478ccbf984
revert changes to chainpad
9 years ago
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
9 years ago
98c85cef8b
xxx
9 years ago
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
9 years ago
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
9 years ago
03932d0169
small changes to chainpad for testing
9 years ago
420a7098a6
more testing and crap
9 years ago
e066730b68
add notes about how hyperjson is to be used
9 years ago
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
9 years ago
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
9 years ago
475ca9bea8
hyperjson.js : used split instead of filter... oops
9 years ago
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
9 years ago
b2753ef7b7
fix string manipulation off-by-one
9 years ago
f98fda7604
fix string manipulation off-by-one
9 years ago
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
9 years ago
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
9 years ago
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
38d797a4f1
Fix issue with Chrome and WebRTC
9 years ago
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
9 years ago
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
9 years ago
eca4ec699c
Ability to change the username (the user ID is displayed by default)
9 years ago
6e50ae94dd
Remove unused code
9 years ago
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
9 years ago
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
9 years ago
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
9 years ago
06e5c84702
Clean some code
9 years ago
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
9 years ago
c576241104
Add a Chainpad adapter to make Chainpad know the userList
9 years ago
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
9 years ago
b7885eb539
Fix channel history
9 years ago
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
9 years ago
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
9 years ago
c536ecbc1c
Temp commit
9 years ago
870b2dbb7e
Add the WebRTC server in Cryptpad
9 years ago
c4f62fb812
First try with WebRTC
9 years ago
09a06a8bc5
Replace the chainpad server by the netflux server
9 years ago
60c3aceb0d
Add chatflux server
9 years ago
deb2084fc5
Add the socket connection checker
9 years ago
d3e2a2f52e
make verbose logging switchable via a conditional
9 years ago
fefb904261
realtime input changes
9 years ago
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
9 years ago
62ba579d4a
Add Netflux API with WebSocket service V1
9 years ago
d7b34cf6be
don't call toolbar from within realtime-input.js
9 years ago
5e1566eaec
fix incomplete 'onAbort' block
9 years ago
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
9 years ago
6ff5b10486
remove local diffDOM version
9 years ago
93fb944e1f
remove broken functions from convert module
9 years ago
7d65540123
fix undefined reference
9 years ago
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
9 years ago
f5a8727254
remove some unused functions from cursor.js
9 years ago
db1515c445
cursor.js : commit before cleaning up
9 years ago
91ada5ce7a
export Operation from chainpad. for use with OT
9 years ago
5425699f43
check if possible parent exists before checking if it contains another element
9 years ago
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
9 years ago
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
9 years ago
de46be85ba
add better helpers for finding and resetting the cursor
9 years ago
c09036bd29
snapshot cursor.js, as some things are working quite well now
9 years ago
4eee1f5210
add orderOfNodes function to tree library
9 years ago
7689151fc0
pull json validation for OT into its own module for reuse
9 years ago
2c8a2406c6
cursor.js : snapshot before code deletion
9 years ago
1beb3f5355
snapshot of treesome.js before deletion
9 years ago
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
9 years ago
d1885fbab6
better jshint compliance for common files
9 years ago
539cc3a2fa
remove unused files from common directory
9 years ago
afa2811472
remove local version of marked.js, prefer bower version
9 years ago
a600ece5c5
fix jshint complaints in common directory
9 years ago
2c5a2b6023
remove unused code, add todos, fix minor errors
9 years ago
967d636df9
address more jshint complaints
9 years ago
f6c848385f
hyperjson.js : jshint complains about var index in for loop
9 years ago
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
86c4a69a97
Switch to patching with DiffDOM for testing :D
9 years ago
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
2031191261
testing=false
9 years ago
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
9 years ago
c22269e36e
cursor.js : make the console a little less noisy
9 years ago
99a23154b7
files for unstubbing OT
9 years ago
c740c0ec92
add stuff for walking the tree
9 years ago
ad184b1114
add stuff to recover the cursor
9 years ago
019750bea8
realtime-input.js : callback onInit if exists
9 years ago
7102a0a164
make rainbows
9 years ago
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
9 years ago
d96124229b
clean up realtime-input.js, break API
...
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
9 years ago
ed03a48092
minor patches that make things a bit more reliable, still some bugs
9 years ago
ac0f7852fc
committing latest changes for review
9 years ago
2016550e01
virtual-dom.js : identify problem area?
9 years ago
fd1e5d5735
better styling on render page
...
now solarized dark
9 years ago
b18dfef656
sharejs textarea is used by realtime-input.js
9 years ago
997ce1147f
realtime input wraps up basic realtime stuff
...
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
9 years ago
40b8c0efe8
drop in chjj's marked.js for a cool demo
9 years ago
0c2e057f9d
export component APIs from convert
9 years ago
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
9 years ago
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
9 years ago
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
9 years ago
9fc44cdf0c
add notes to clientside js files
9 years ago
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
9 years ago
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
10 years ago
51544db9a2
Completed adding of customization system and bottom infobar
10 years ago
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
10 years ago
e039e90a24
upgrade to most recent chainpad
10 years ago
50c10f818e
Added cryptsheet to cryptpad suite!
10 years ago
yflory