b7d9998b9b
fix reference to undefined variable
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
8e1bff706b
Add drag and drop, rename and delete actions
8 years ago
67bf41627d
comment out dead code so CI doesn't complain
8 years ago
002e22ee9a
turn off unwanted behaviour until we can do it correctly
8 years ago
5fc44a6e4b
Merge branch 'soon' into fixpolls
8 years ago
ce9eb47351
Initial state of the file manager app
8 years ago
2d5448458b
export messages
8 years ago
b1370c05b7
add translation completeness test to assertion page
8 years ago
5f6ebb5cc1
fix incorrect regex for c-like title detection
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
8 years ago
636b0fcadc
do our best to keep the console quiet
8 years ago
3de4e5709b
Clean the code
8 years ago
ab1d3958ce
Add a pencil icon when hovering the title
8 years ago
6d1e06cca3
Add notifications when a user joins or leaves the channel
8 years ago
54a63267cd
Add a share button and merge the viewers and editors buttons
8 years ago
87d86384ac
Fix broken elements in the new toolbar
8 years ago
6351d1856f
Remove the top bar and move its content in the applications' toolbars
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
0a9d34a6c9
hide appended color pickers
8 years ago
c858b247c1
filter absent users from the userlist
8 years ago
ac3ddbab70
expose userList for later usage
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
8 years ago
46c5f64369
remove absent users from the userlist
8 years ago
51a79c5218
Remove unused dependency
8 years ago
9a733bb360
Fix dropdown menus with Edge
8 years ago
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
e739c49e7f
Remove the 'about' button in ckeditor
8 years ago
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
53fe002d3b
Merge branch 'slide' into soon
8 years ago
6c04b7967d
Remove unused library
8 years ago
d63c912af0
Use the HTML5 color picker to change the colors in slides
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
d7e170c797
Test colorpicker
8 years ago
81fce1237f
Colorpicker to choose the background color in present mode
8 years ago
5300bc363c
Fix a race condition in the slide application
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
a28daf2715
use websocket url configuration api
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
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
8 years ago
5e76194262
use new config api
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
1c808b3da8
Add comment for the 'important' css rule
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
b5b0eacebc
Remove the old (non-bower) codemirror
8 years ago
261d2fecbc
Get codemirror from bower and use that version in the code app
8 years ago
bc73fa2074
Merge branch 'fontawesome' into soon
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
a266f0bee1
query parameter for messages
8 years ago
c16e8d603b
Enable reconnecting websocket in code pad
8 years ago
d6525087c7
jshint compliancy
8 years ago
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
8 years ago
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
8 years ago
a82b7aaf8b
allow empty names
8 years ago
2267ec8c43
Slides in read-only were not updated with the latest content
8 years ago
eac0cdd6dd
Enable read-only mode in slides
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
73d5ea967b
Fix an error created by the merge
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
99004428d5
Enable the read-only mode in Cryptpoll
8 years ago
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
a9e2ca8d72
make tests green again
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
e6785b4dad
push /pad/ state once ready to avoid OT collision
8 years ago
723df4880e
Merge branch 'slides' into merge-slides
8 years ago
b96f050555
Merge branch 'board' into merge-boards
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
2d42cadb23
push /code/ state once ready to avoid OT collision
8 years ago
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
8 years ago
bf8c9a2c4b
Add a button to get the read only URL
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
6363d3fb90
Pad titles are now shared with the userdoc
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
cc4bca8004
execute callbacks on presentation events
8 years ago
8bf79ef915
serialize slide pads as a sorted object
8 years ago
997b46a3f7
limit the size of rendered images
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c35c7cda20
hide wizard after computing results
8 years ago
0dae949c4f
fix scrolljank bug
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
122a9fe068
realtime kanban board
8 years ago
4561ddcdf3
add missing semicolon
8 years ago
8031770f90
rename "module" to "APP" in /slide/ for jshint
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
2f2aeef0e5
add missing semicolon
8 years ago
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
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
7c5ee53e81
resolve conflict and merge
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
e386749e89
unlock the editor after your name has been set (or not)
8 years ago
aa91ebd24e
don't initialize until the store is ready
8 years ago
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
dcebb9597f
prototype of password based key derivation
8 years ago
848f16e8f5
unused function which computes values for the table
8 years ago
18ea61dc9a
use diffdom for sanitation and better redraws
8 years ago
c62d064ee9
add a 'share' button which copies the url to the clipboard
8 years ago
b229a18ccf
notify users of changes if the visibility api is supported
8 years ago
d64e06c12e
don't make empty options
8 years ago
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
8 years ago
8c914dfe1f
better filenames
8 years ago
f1619f4a0f
get /slide/ up to par with other prototypes
...
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
8 years ago
269eba3c47
remove commit button if a user is removed
8 years ago
f8f66800d1
display a 'commit' button which locks your column
8 years ago
85540bad12
leave all columns locked unless you've visited before
8 years ago
d679cac666
fewer log statements for the console
8 years ago
55b1a17b0d
off by one error
8 years ago
235c0482f9
increase clickable area around editable columns' checkboxes
8 years ago
c76aaac542
don't make columns with empty names
8 years ago
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
8 years ago
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
8 years ago
e2b162bf6d
snapshot some dead code
8 years ago
55666e9f70
remember presentations, and label them correctly on the home page
8 years ago
5a3da11c40
very simple presentation with markdown
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
9 years ago
da6e5d73d0
fix undefined reference
9 years ago
043041523f
on import, fall back to setting language from file extension
9 years ago
deb63d2447
share syntax highlighting selection with peers
9 years ago
2d5caf38d9
show a spinner until the document has loaded
9 years ago
fd0a7337a3
wait a full minute until requirejs times out
9 years ago
975bff5794
show a spinner until the document has loaded
9 years ago
a58f58535b
better regex for pulling titles out of c-like comments
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
01d9923e15
export Cryptpad at window level
9 years ago
fa654a7646
slightly better regex
9 years ago
254d800a3b
add a /p/ route so that we don't break old urls
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
9b16d529ca
add one more missing script that caused handlebar highlighting to break
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
93142b364f
tests for pretty printed html
9 years ago
4833cf0d7b
add a fontpicker
9 years ago
6cb2f72aa6
pretty print html during export if possible
9 years ago
c09166efe2
scroll down when adding a new option to the table
9 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
9 years ago
fe3f02f5e0
enable text foreground and background colors
9 years ago
68f8d0101d
fix flash of unstyled content
9 years ago
8ea6c03094
notify user on disconnect
...
also disable inputs
9 years ago
efd190beca
export file with correct file extension, if possible
9 years ago
5e71a5473c
add another missing script
9 years ago
992bc4f449
add missing script
9 years ago
2351d8a23e
make tests green again
9 years ago
068a3f5944
remove rows from the poll
9 years ago
c6bdb7506d
forget everything about a pad when you forget it
9 years ago
b8a3a4d188
persist usernames across sessions via localStorage
9 years ago
846d1135b9
set mode in the editor, not just the dropdown
9 years ago
446266a79b
remember the last language used on a particular pad
9 years ago
e84fbf0bc3
more helpers in common
9 years ago
70f8837681
maintain scroll position on remote changes
9 years ago
c267dd6a88
ensure that 'text' is a string
9 years ago
2f2ab4392c
clear the table on user clicks
9 years ago
64f030c344
add a clear table button
9 years ago
d2c5cfe646
add col/row ids to arrays
9 years ago
1a63faf188
infer names from the first comment on code pad
9 years ago
f77e2cec34
set text values of new options
9 years ago
52ab5147c9
add a missing semicolon so tests don't fail
9 years ago
e3f4df7e0a
push my latest changes because I'm agile
9 years ago
cde239c97a
implement row/column removal
9 years ago
9860b7427a
addition signs are slightly informative
9 years ago
ac50bf7286
height and width of the table are unreliable because of multiple users. remove them
9 years ago
a3254a2619
consistent ordering of columns and rows
9 years ago
d30eddf2f2
ui hint for 'adduser' and 'addoption'
9 years ago
a995f2306d
fix undefined variable reference
9 years ago
44fe95c76b
add titles to buttons on pad and code
9 years ago
ebf5c27453
add rename and forget buttons to poll app
9 years ago
f7a1332317
add a 'back' button
9 years ago
7dd1624206
commit polls to localStorage
9 years ago
0cf5f3cc87
realtime polls!
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
6f598682f8
templates for custom themes
9 years ago
02cd2fbee0
style fixes for the ansuz theme
9 years ago
c9edf69ed1
one less prototype using messages.js while we figure out internationalization
9 years ago
3eccec7054
better effort for translation
9 years ago
3bdfee71e1
move padrtc to .git
9 years ago
18ce69b756
use constants from toolbar.js, address linter warnings
9 years ago
2a7a84b774
use constants exported from toolbar for selections
...
make things a little less brittle
address linter warnings
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
750731d3db
workaround for favicon magic
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
a2a8570453
use alertify UI in /pad/
9 years ago
e32c0aaac8
use alertify UI in /code/
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
85702f2706
inform users of changes in /pad/ too
9 years ago
1ae212af44
let users know when changes have occurred while tabs lack focus
9 years ago
6075849ed7
add favicons to /pad/ and /code/
9 years ago
73d2b6561a
add small modules for page visibility api and notification apis
9 years ago
7e8d66a141
filter unwanted elements when receiving patches
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
ec0dba3f7c
correct undefined reference
9 years ago
a3da10766a
add rename button to /code/ and /pad/
9 years ago
93dcf29c15
more functions for working with localstorage
9 years ago
93fed83a08
remove annoying border around editor
9 years ago
23788bca67
add 'ansuz' theme because I'm horribly vain
9 years ago
22929fd3f5
add title attributes for dropdown menus
9 years ago
8b1a2b7b8b
commit theme choices to localStorage
9 years ago
fb2ca04c34
add a theme selector
9 years ago
dc8e36bf20
move themes directly into ./code/
9 years ago
908e79c0b9
add autolink plugin
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
5b79775810
infer modes from MIME types
9 years ago
df99395b4d
fix a few more paths that I missed
9 years ago
b3deb9531d
fix paths that I broke when updating codemirror
9 years ago
82a9b05d5f
upgrade to newest codemirror
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
a89511985f
add _really_ basic multilanguage support. I'll come back for css later
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
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
9 years ago
849683d586
update to use new style crypto module
9 years ago
f94c06abc0
drop a bunch of stuff and use diff dom and hyperjson
9 years ago
69f3f4c9a8
drop hyperscript dependency
9 years ago
f607fcc0ad
test using newest hyperjson. forget hyperscript
9 years ago
c3d2568d3c
add file export for codepad
...
addresses #24
9 years ago
920dbeabd1
add a save button
9 years ago
4cc5388c76
trial run of canvas export via filesaver.js
9 years ago
f818d873bb
remove usernames, refactor a wee bit
9 years ago
2b8c21d292
set styles with setAttribute. fixes style fights
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
48d222e565
depend on listmap api from bower
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
beba78d7f8
update prototype dependencies
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
f76dc615c0
use chainpad-crypto from bower and pass it into the listmap api
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
cf2866baa7
use json-ot from bower for tests
9 years ago
5bb77bd50c
add UI.add and UI.remove methods.
...
also use json-ot from bower
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
dccf5e8dcf
use listmap api from common/
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
f80e9772a8
merge api.js and deep-proxy.js into one file
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
6f7543e9cc
demonstrate chaining of 'on' directives
9 years ago
e44446f71e
proper recursive proxy initialization
9 years ago
68cec2348a
don't prompt the user with a crypto hash for their name
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
2b9ac14cb1
restructure main to take advantage of new callback infrastructure
9 years ago
fea74782a2
remove a little more dead code that I missed
9 years ago
a58d6c745a
implement remaining listeners and factor
...
* 'isProxyable' helper
* 'find' helper
* 'lengthDescending' helper (for sorting change/remove events by path length)
* implement recursive proxy creation
* implement recursive proxy removal
* implement 'bubbling' prevention (via return false)
* implement create, ready, and disconnect event handlers
* return 'this' from 'on'
* trim dead code
9 years ago
4222c0b516
simplify api
...
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
a0ec5eada8
better fix for magicline filter
9 years ago
9336c4de5c
import latest chainpad
9 years ago
d0b553d198
port Yann's multiple-select implementation to cryptpad
9 years ago
e3b8a10959
fix magicline filter
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
599f5aeec8
add sample listeners for debugging
9 years ago
3afd144562
don't make noise when adding a listener
9 years ago
e86a3567be
more minor bugfixes and general improvements
...
off by one error in deletion loop (and undefined references)
sort listeners by pattern specificity
deletions are changes (for now)
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
7c63219add
fix some minor bugs
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
e189092ba8
document/spec the listmap api in its current/intended form
9 years ago
55846044e1
rewrite underlying API. implement listeners
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
014dce272b
working on better abstractions. still held together with duct tape
9 years ago
c1bca09cce
move list/map functionality into wrapper file
9 years ago
f61d06fa18
first commit for listmap prototype
9 years ago
774d349ec3
ignore hidden elements and submit buttons
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
297d8c2d44
reformat code for jshint compliance
9 years ago
baf523e9a5
add new functionality from xwiki development
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
cae750cd75
update padrtc for to use bower libraries
9 years ago
ad3c53c344
use textpatcher from bower for all pads
9 years ago
0cd4f85ff0
remove migration notes
9 years ago
a7cbd8c470
we're pushing json over the wire, so let's use json-ot.validate
9 years ago
3ea270acb9
fix cursors in form prototype
9 years ago
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
9 years ago
663c157e2a
expose text patcher to the window via APP
9 years ago
1769ca16dc
add example for configuring the logLevel in /pad/
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
dcd130cd9d
use hyperjson from bower in padrtc
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
d2fa5e8f70
start using hyperjson from bower.io
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
aef6f3a85b
lock codemirror editor until chain has synced
9 years ago
6736335db2
add 'made with <3' toolbar to code
9 years ago
506a703b7d
turn off TextPatcher logging on /pad/
9 years ago
ba17b78f7a
restyle name change button
9 years ago
d79b3616c9
remove unused files
9 years ago
4c84758265
disable textpatcher logging
9 years ago
46b009d20f
remove last non-netflux pad
9 years ago
18e0131d6e
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
9 years ago
32d1807350
import unused functions from /p/, to be integrated later
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
626ecaffcd
log browser fights in /pad/
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
afe78dad56
Merge branch 'netflux' into beta
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
a735d63306
migrate markdown rendering 'pad' to netflux
9 years ago
f5f8f6e1eb
Remove the delay between a change and its propagation to chainpad
9 years ago
fa6914037c
start rewriting codepad to use realtime-input
9 years ago
2852c8f594
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
9 years ago
fe3bb4da27
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
53b2644b64
Fix a issue with fights over usernames
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
255dc17a5d
Merge branch 'beta' into netflux
9 years ago
f9de1c9e1f
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c14b86d84a
add missing semicolon
9 years ago
b3ef2abb84
fix jshint complain
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
9 years ago
22cf18f78c
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c509c28c18
realtime form prototype, almost in good condition
9 years ago
1a9e7299fc
working state
9 years ago
69e8f54e8f
pass in Crypto to realtime-input
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
be1ef7abe3
migrate canvas to netflux
9 years ago
d4943511fe
move text/ and hack/ to Netflux
9 years ago
4c95602347
remove a little bit more dead code
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
2c6cf9883b
stop using deleted file
9 years ago
bbdc9da853
delete duplicated file
9 years ago
cce50390a0
don't depend on library to set hash
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
80fb5e1e21
don't rely on RealtimeSocket exporting textPatcher
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
a527024a8c
start on realtime form prototype
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
04f6299938
reconcile differences with netflux
9 years ago
565fb1d186
include small snippets for preventing browser fights
9 years ago
ffbd428b87
better logging of browser fights
9 years ago
4d44661f3b
more correct tests
9 years ago
a18c793f98
use latest hyperjson
9 years ago
980ff8a0ca
Fix a test that was failing on chrome
...
it failed for reasons which are irrelevant to our application
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
9498937b43
add a FIXME to the assert page
...
tests were failing (unnecessarily) on Chrome
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
06b464c524
move sheet/ to .git
9 years ago
cdf02ac725
remove input pad
9 years ago
11961b4f1d
export stringifyDOM to REALTIME_MODULE
9 years ago
5db487db3f
remove old pad entirely
...
hyperjson version is considered a strict improvement
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
1639c5b099
use hyperscript and hyperjson from common
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
e357549eda
push browser fights into an array for inspection
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
1c7954ed51
Grab Fabric off of the window
9 years ago
06786b6e02
Remove redundant declaration
9 years ago
df22c246c4
serialize text nodes correctly
9 years ago
7ca5f47d02
remove multitest pad since it offers no significant benefit
9 years ago
bafdd588dd
fix /hack/ to not require sharejs textarea
9 years ago
f2db6b83eb
better sizing for palette options
9 years ago
5ce158d2e2
add more colors
9 years ago
7c4b334ad3
here's a canvas app!
9 years ago
41276fffb5
repair /text/ application, conform to new API
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
4095201d15
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
822b2bd2b9
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
5a5b9ad718
Merge branch 'netflux' into beta
9 years ago
4af987a2a2
point to correct toolbar.js
9 years ago
3ade46adc7
Merge branch 'newtests' into beta
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
b12a01e08f
report test results on the page, not in the console
9 years ago
feaae609ad
fix broken path for padrtc
9 years ago
ecc41d14af
Use canonical serializer for json serialization
9 years ago
fc77ef66b3
Merge remote-tracking branch 'origin/sortify' into HEAD
...
utilize canonical stringify function
Conflicts:
www/_socket/main.js
9 years ago
319f5b95f7
Use canonical serializer for json serialization
9 years ago
9683fd9aec
Always serialize the DOM in one way.
9 years ago
698338b49a
Use canonical serializer for json serialization
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
468827dadd
newest tests
9 years ago
c867ab04ab
rename /_socket/ app to /p/
9 years ago
a1fe941f69
Always serialize the DOM in one way.
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
284da6a4e9
minor improvements I made to the /hack/ pad last night
9 years ago
9f0cc4ed64
update hack with a slightly better UI
9 years ago
71c0a06c3b
Merge branch 'hack' into diffdom
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
f75c246029
remove dead code from pad/main.js
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
d705b947ab
Merge branch 'diffdom' into netflux
...
basic cleanup while performing a larger merge between two prototypes
9 years ago
2ffa69dc15
remove checks for a non-existent race condition
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
a0999d1d2b
add a comment about why hashes are being stubbed
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
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
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
a07774e81a
Implement tests for serialization
...
ensure that complex DOM elements can serialize and deserialize without modifications
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
6bb37aed44
main.js : support tab insertion in /hack/ pad
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
1a22592afa
remove unused modules from realtime-input.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
2c34833d2c
break text-patcher's functionality into components
...
text-patcher.js now exports diff, patch, log, and apply change
in addition to the previous 'create' method.
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
4071a3aa25
revert to using the chainpad in /common/
...
now that we have found the problem that caused the backspace bug
we don't need a special chainpad for testing.
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
360fee9feb
Fix a new cursor error with Codepad
9 years ago
c2e0dded3a
Fix an issue with the cursor sometimes disappearing when a patch was received
...
Update CodeMirror to the latest version (5.13.2)
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
c53baab99d
Update Codepad with the latest improvements
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
cd357a9136
turn an alert into a console.error
9 years ago
ec64e0d381
use getAttribute to inspect document elements
...
el.getAttribute('attr') is more reliable than el[attr].
9 years ago
f5b0e1a5df
Add comments, debug variables. initialize better
...
Expose Hyperscript via window.REALTIME_MODULE
Make sure to pass in a JSON.parse'able initial state.
Add comments detailing the problems with not using setAttribute
9 years ago
842b9d4243
Generalize _socket/realtime-input.js a little more
...
Anything JSON related should be at the application layer
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
2691d85582
use forked chainpad with assertions for _socket
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
df78d284c4
initial state should be valid JSON so JSON parse doesn't fail
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
aaf7c777cc
add debugging info to the textPatcher
...
* kill dead code
* add assertions
* better logging for insertions and removals
9 years ago
523df40d09
Debugging concurrent typing:
...
track whether there are local operations in progress, such that we can tell
whether a remote change is interrupting the DOM's conversion to hjson.
9 years ago
e446a3645c
don't send funny BR attributes over the wire. Properly initialize the typing test
9 years ago
22290590cb
don't rely on window scope in typingTest.js
9 years ago
772ca5d30e
comment out debugging line
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
e51635c4bb
fix index error
9 years ago
3aebf7d2c2
minor changes to pass linting
9 years ago
29e24f556c
kill another window variable
9 years ago
e699073d45
attempt to preserve the magic line plugin while someone else is typing
9 years ago
941f5361ea
forgot to add 'typingTest', which main depends on
9 years ago
d852c578d8
removed dead code
9 years ago
5591aae8fa
Clean up main file
...
* convert.js includes the vdom library, which we aren't using anymore
- removed, and replaced with the simple functions from Hyperjson and Hyperscript
* removed several variables that had been exported to 'window'
* moved the testing functions out into their own file for easier reuse
* restructured realtime initialization to be more compact
9 years ago
478ccbf984
revert changes to chainpad
9 years ago
e3b78e20de
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
e26246178f
start to clean up and give things more sensible names.
...
get rid of the textarea entirely
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
f3fb674504
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
98c85cef8b
xxx
9 years ago
12dcbc9121
fix quick red fox and make test.cancel work again
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
669bcc1935
If there is a difference in the hjson then send a message back
9 years ago
f62ec85a4c
Shuffled around some assertions and logs
9 years ago
420a7098a6
more testing and crap
9 years ago
4b35a145e3
Push WIP
9 years ago
42c972116b
leave TODO re: diffDOM and magicline
...
Hyperjson guarantees that magicline elements are not sent across the wire.
DiffDOM must guarantee that magicline elements will not be removed on remote edits.
9 years ago
e066730b68
add notes about how hyperjson is to be used
9 years ago
cd462ed872
Merge legacy websocket version
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
ansuz