Commit Graph

1189 Commits (ce6cd1211ed567c48b3ee61d6571903ff0324bde)

Author SHA1 Message Date
yflory f05efbb113 Clean the code
yflory 851d3df656 Ability to see, move and delete unsorted files
yflory 43d93938c3 Fix the list, find the unsorted files, ability to add a folder
yflory cfe3d38197 Add expend/collapse to the tree, fix CSS, add list/grid view modes
yflory c9cd06514c Add "restore" from trash, improve drag and drop and update css
ansuz 4c5cb79c20 Merge pull request from xwiki-labs/replaceState
use replaceState if available
ansuz c2770a7a74 set correct hash even if browser does not implement replaceState
ansuz d009b7400c fall back to default title if one is not suggested
ansuz e77ad4e909 better fixes for export
ansuz 75dd4a5926 slightly better test for variable
ansuz b7d9998b9b fix reference to undefined variable
ansuz 303c65f2c3 use replaceState if available, instead of setting the hash
yflory 8e1bff706b Add drag and drop, rename and delete actions
ansuz 67bf41627d comment out dead code so CI doesn't complain
ansuz 002e22ee9a turn off unwanted behaviour until we can do it correctly
ansuz 5fc44a6e4b Merge branch 'soon' into fixpolls
yflory ce9eb47351 Initial state of the file manager app
ansuz 2d5448458b export messages
ansuz b1370c05b7 add translation completeness test to assertion page
ansuz 5f6ebb5cc1 fix incorrect regex for c-like title detection
ansuz d512b113cd address failure to parse url when hash is not present
ansuz 6ae851ffdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
ansuz 636b0fcadc do our best to keep the console quiet
yflory 3de4e5709b Clean the code
yflory ab1d3958ce Add a pencil icon when hovering the title
yflory 6d1e06cca3 Add notifications when a user joins or leaves the channel
yflory 54a63267cd Add a share button and merge the viewers and editors buttons
yflory 87d86384ac Fix broken elements in the new toolbar
yflory 6351d1856f Remove the top bar and move its content in the applications' toolbars
yflory 3d74290c7d Merge branch 'usability5' into staging
yflory 9e92a597b3 Ability to edit the title in the toolbar by clicking it
ansuz 0a9d34a6c9 hide appended color pickers
ansuz c858b247c1 filter absent users from the userlist
ansuz ac3ddbab70 expose userList for later usage
ansuz a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
Yann Flory 10bb5e1607 Add the title in the toolbar
Yann Flory 1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad
ansuz 5d9b81ab2f Merge pull request from xwiki-labs/update
minor fixes to html and userlist
ansuz 46c5f64369 remove absent users from the userlist
yflory 51a79c5218 Remove unused dependency
yflory 9a733bb360 Fix dropdown menus with Edge
yflory 39bbf8a6c1 Fix the new userlist button and make the toolbar responsive
yflory 24fbe22c9d Improve the toolbar style and the way the userlist is displayed
yflory d2389a5729 Change the userlist in the toolbar
yflory e739c49e7f Remove the 'about' button in ckeditor
yflory b23fe783e3 Fix the color picker in Chrome and hide the buttons when not supported
yflory 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon
yflory 53fe002d3b Merge branch 'slide' into soon
yflory 6c04b7967d Remove unused library
yflory d63c912af0 Use the HTML5 color picker to change the colors in slides
ansuz bb2317d8e6 fix chrome style bug by forcing reload of style sheet
yflory 765498e88e Remove the support for old.cryptpad.fr
yflory d7e170c797 Test colorpicker
Yann Flory 81fce1237f Colorpicker to choose the background color in present mode
yflory 5300bc363c Fix a race condition in the slide application
yflory c322aa440e Fix the username icon hcih was not working anymore
yflory 8575f3f79f Fix the "rename" feature which was not working anymore in some cases
yflory a989b51d74 Fix race conditions with Alertify
yflory 74df38f94f Fix race conditions that could prevent applications from being loaded
ansuz a28daf2715 use websocket url configuration api
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance
yflory a30e17121d Merge branch 'readonlyButton' into soon
yflory e84a54556c Move the toolbar buttons' events handlers in cryptpad-common
ansuz 2ac1b02572 Merge branch 'config-sockets' into soon
ansuz 11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
ansuz 5e76194262 use new config api
ansuz 3dfa19b786 more flexible websocket configuration (WIP)
yflory 76fdadee7f Store only the strongest hash in the localstorage
yflory 1c808b3da8 Add comment for the 'important' css rule
yflory 17b4f91810 Do not share the title in the doc if it is the default title
yflory 391728ee6d Use CodeMirror in /slide
Fix title errors in the slide app caused by the present mode
yflory 8c33218ceb Move the codemirror themes in /common
Yann Flory 2609af2105 Use the CodeMirror editor in the slide application
yflory b5b0eacebc Remove the old (non-bower) codemirror
yflory 261d2fecbc Get codemirror from bower and use that version in the code app
yflory bc73fa2074 Merge branch 'fontawesome' into soon
yflory f03018f3bc Improve the top bar and use the font awesome icons in /code
ansuz 0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
yflory 3d54413343 Improve the UI with FontAwesome icons
ansuz a266f0bee1 query parameter for messages
yflory c16e8d603b Enable reconnecting websocket in code pad
ansuz d6525087c7 jshint compliancy
ansuz ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
ansuz a4843cb5d7 Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
ansuz a82b7aaf8b allow empty names
yflory 2267ec8c43 Slides in read-only were not updated with the latest content
Yann Flory eac0cdd6dd Enable read-only mode in slides
yflory d46bd1af5c Improve the toolbar UI with the username displayed
yflory 79884e2400 Use the same username for all pads
yflory 73d5ea967b Fix an error created by the merge
yflory dde519795d Merge branch 'newhash' into newhashNoConflict
yflory 99004428d5 Enable the read-only mode in Cryptpoll
yflory 47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode
ansuz f29e3d7b0d don't let notifications interfere with document titles
ansuz a9e2ca8d72 make tests green again
yflory 83705ae058 Improve the UI in read-only mode
ansuz e6785b4dad push /pad/ state once ready to avoid OT collision
ansuz 723df4880e Merge branch 'slides' into merge-slides
ansuz b96f050555 Merge branch 'board' into merge-boards
ansuz fa8199bc75 don't try to use experimental user code
ansuz 2d42cadb23 push /code/ state once ready to avoid OT collision
ansuz bf5dac58dd Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
Yann Flory bf8c9a2c4b Add a button to get the read only URL
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code
Yann Flory 42f14873cd Merge branch 'translations' into newhashmerge
Yann Flory 391b7690e6 Set the pad to readonly mode when using a 'view' url
Yann Flory 368e253c9f Ability to send a read-only URL
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc
yflory 5c63585952 Complete the French translation
yflory 0d9f63b977 Merge branch 'translations' - part one
yflory f086492e50 Improve the localization system
Improve and enable the French translation
ansuz cc4bca8004 execute callbacks on presentation events
ansuz 8bf79ef915 serialize slide pads as a sorted object
ansuz 997b46a3f7 limit the size of rendered images
yflory 25c8d16bf5 Use a new version-prefixed hash parser
ansuz c35c7cda20 hide wizard after computing results
ansuz 0dae949c4f fix scrolljank bug
yflory c736caceba Use a better default pad title
ansuz 97415d8158 Merge branch 'users'
ansuz 122a9fe068 realtime kanban board
ansuz 4561ddcdf3 add missing semicolon
ansuz 8031770f90 rename "module" to "APP" in /slide/ for jshint
ansuz 8e86be81b2 Merge branch 'better-slides'
ansuz fb21b4e46b fix up /render/
ansuz 4941c1493e better user integration. a few more common utils
ansuz 2f2aeef0e5 add missing semicolon
ansuz 8a659cf887 maintain aspect ratio for slides
display index and slide count in title
ansuz 30ea1b59b7 integrate users into common utilities
ansuz 6d775f61c6 add missing functions
ansuz 168338b898 add missing functions
ansuz 7c5ee53e81 resolve conflict and merge
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad
ansuz f40b798d88 Merge pull request from xwiki-labs/reconnect
Ability to reconnect after a connection failure
yflory c168ce2d1c Ability to reconnect after a connection failure
ansuz e386749e89 unlock the editor after your name has been set (or not)
ansuz aa91ebd24e don't initialize until the store is ready
ansuz 93f5a3d3e9 use more bits from the users' seed and parse into various subkeys
ansuz 1bec02239c coerce dates into strings
ansuz 0add01a940 remove dead code
ansuz dcebb9597f prototype of password based key derivation
ansuz 848f16e8f5 unused function which computes values for the table
ansuz 18ea61dc9a use diffdom for sanitation and better redraws
ansuz c62d064ee9 add a 'share' button which copies the url to the clipboard
ansuz b229a18ccf notify users of changes if the visibility api is supported
ansuz d64e06c12e don't make empty options
ansuz a3f6fe8843 lock options by default
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
ansuz 8c914dfe1f better filenames
ansuz 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
ansuz 269eba3c47 remove commit button if a user is removed
ansuz f8f66800d1 display a 'commit' button which locks your column
ansuz 85540bad12 leave all columns locked unless you've visited before
ansuz d679cac666 fewer log statements for the console
ansuz 55b1a17b0d off by one error
ansuz 235c0482f9 increase clickable area around editable columns' checkboxes
ansuz c76aaac542 don't make columns with empty names
ansuz 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
ansuz 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
ansuz e2b162bf6d snapshot some dead code
ansuz 55666e9f70 remember presentations, and label them correctly on the home page
ansuz 5a3da11c40 very simple presentation with markdown
ansuz 7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain
ansuz da6e5d73d0 fix undefined reference
ansuz 043041523f on import, fall back to setting language from file extension
ansuz deb63d2447 share syntax highlighting selection with peers
ansuz 2d5caf38d9 show a spinner until the document has loaded
ansuz fd0a7337a3 wait a full minute until requirejs times out
ansuz 975bff5794 show a spinner until the document has loaded
ansuz a58f58535b better regex for pulling titles out of c-like comments
ansuz 5131f47cca jshint compliance
ansuz 306d524416 fix broken removal call
ansuz dd3a5d47be migrate localStorage so people go to cryptpad.fr
ansuz a094e3c02e use correct store api calls in frame.js
also don't log unnecessarily
ansuz dcc9810a42 avoid extra call to store if there are no keys to remove
ansuz 9a5294016d fix incorrect usage of store api
ansuz 4e5f381325 add spinner to API. update bower deps
ansuz 01d9923e15 export Cryptpad at window level
ansuz fa654a7646 slightly better regex
ansuz 254d800a3b add a /p/ route so that we don't break old urls
ansuz cd18075ac7 add some redirection logic to support old hash types
ansuz 600f3151e9 don't use the store until it's ready to be used
ansuz fffa9acf15 remove unused files from fs and jshintignore
ansuz 551d38c930 let the abstraction take care of stringification
ansuz 9b16d529ca add one more missing script that caused handlebar highlighting to break
ansuz 0ada6a3d0a jshint compliance. gotta keep those tests green
ansuz 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
ansuz 7f02c899ea add snippet for copying text to the clipboard
ansuz 93142b364f tests for pretty printed html
ansuz 4833cf0d7b add a fontpicker
ansuz 6cb2f72aa6 pretty print html during export if possible
ansuz c09166efe2 scroll down when adding a new option to the table
ansuz 42eafe9e29 don't create duplicate stylesheets in the document head
ansuz fe3f02f5e0 enable text foreground and background colors
ansuz 68f8d0101d fix flash of unstyled content
ansuz 8ea6c03094 notify user on disconnect
also disable inputs
ansuz efd190beca export file with correct file extension, if possible
ansuz 5e71a5473c add another missing script
ansuz 992bc4f449 add missing script
ansuz 2351d8a23e make tests green again
ansuz 068a3f5944 remove rows from the poll
ansuz c6bdb7506d forget everything about a pad when you forget it
ansuz b8a3a4d188 persist usernames across sessions via localStorage
ansuz 846d1135b9 set mode in the editor, not just the dropdown
ansuz 446266a79b remember the last language used on a particular pad
ansuz e84fbf0bc3 more helpers in common
ansuz 70f8837681 maintain scroll position on remote changes
ansuz c267dd6a88 ensure that 'text' is a string
ansuz 2f2ab4392c clear the table on user clicks
ansuz 64f030c344 add a clear table button
ansuz d2c5cfe646 add col/row ids to arrays
ansuz 1a63faf188 infer names from the first comment on code pad
ansuz f77e2cec34 set text values of new options
ansuz 52ab5147c9 add a missing semicolon so tests don't fail
ansuz e3f4df7e0a push my latest changes because I'm agile
ansuz cde239c97a implement row/column removal
ansuz 9860b7427a addition signs are slightly informative
ansuz ac50bf7286 height and width of the table are unreliable because of multiple users. remove them
ansuz a3254a2619 consistent ordering of columns and rows
ansuz d30eddf2f2 ui hint for 'adduser' and 'addoption'
ansuz a995f2306d fix undefined variable reference
ansuz 44fe95c76b add titles to buttons on pad and code
ansuz ebf5c27453 add rename and forget buttons to poll app
ansuz f7a1332317 add a 'back' button
ansuz 7dd1624206 commit polls to localStorage
ansuz 0cf5f3cc87 realtime polls!
ansuz ff74a67a09 translate alertify button messages
ansuz d39ab5c250 point to the actual translation file
ansuz dea8e225db fix double scrollbar issue
ansuz 6f598682f8 templates for custom themes
ansuz 02cd2fbee0 style fixes for the ansuz theme
ansuz c9edf69ed1 one less prototype using messages.js while we figure out internationalization
ansuz 3eccec7054 better effort for translation
ansuz 3bdfee71e1 move padrtc to .git
ansuz 18ce69b756 use constants from toolbar.js, address linter warnings
ansuz 2a7a84b774 use constants exported from toolbar for selections
make things a little less brittle
address linter warnings
ansuz cbeaa8d609 major refactoring for toolbar. CAN HAZ LESS
ansuz 7504f79e05 add log and warn methods to cryptpad common
ansuz 750731d3db workaround for favicon magic
ansuz 3ad5d71ab1 make sure the regular favicon is set
ansuz fd3cd73d0b try to fix favicon bug
ansuz 589b0087a1 listen for keyup events while alertify prompts are active
ansuz a2a8570453 use alertify UI in /pad/
ansuz e32c0aaac8 use alertify UI in /code/
ansuz deae7ac78f don't hide the notification until it has been seen
ansuz 3d3c6e4800 add wrappers for alertifyjs
ansuz 85702f2706 inform users of changes in /pad/ too
ansuz 1ae212af44 let users know when changes have occurred while tabs lack focus
ansuz 6075849ed7 add favicons to /pad/ and /code/
ansuz 73d2b6561a add small modules for page visibility api and notification apis
ansuz 7e8d66a141 filter unwanted elements when receiving patches
ansuz d8b467422a fix default title in localStorage migration
ansuz 7a5877d12a don't filter pads after 30 days
ansuz d844551fba add a forget button. clean up toolbar a bit
ansuz 8a82e11306 make sure title is defined for home page usage
ansuz 71b1f71ba0 fix migration to include ctime
ansuz 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
ansuz ec0dba3f7c correct undefined reference
ansuz a3da10766a add rename button to /code/ and /pad/
ansuz 93dcf29c15 more functions for working with localstorage
ansuz 93fed83a08 remove annoying border around editor
ansuz 23788bca67 add 'ansuz' theme because I'm horribly vain
ansuz 22929fd3f5 add title attributes for dropdown menus
ansuz 8b1a2b7b8b commit theme choices to localStorage
ansuz fb2ca04c34 add a theme selector
ansuz dc8e36bf20 move themes directly into ./code/
ansuz 908e79c0b9 add autolink plugin
ansuz d025d13295 address some jshint complaints
ansuz 12bbf3e8f6 don't drop values onto the window
ansuz ca45e3533d pass loaded file to callback when importing
ansuz 5b79775810 infer modes from MIME types
ansuz df99395b4d fix a few more paths that I missed
ansuz b3deb9531d fix paths that I broke when updating codemirror
ansuz 82a9b05d5f upgrade to newest codemirror
ansuz 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
ansuz a89511985f add _really_ basic multilanguage support. I'll come back for css later
ansuz 31aa09d6f6 work a bit more on import/export and code highlighting
ansuz 242c9a99e3 implement import and export in /pad/
ansuz 1526c26f8e remember code and wysiwyg pads
ansuz 0a8137e7eb move rememberPad to cryptpad common and simplify it a bit
ansuz 849683d586 update to use new style crypto module
ansuz f94c06abc0 drop a bunch of stuff and use diff dom and hyperjson
ansuz 69f3f4c9a8 drop hyperscript dependency
ansuz f607fcc0ad test using newest hyperjson. forget hyperscript
ansuz c3d2568d3c add file export for codepad
addresses 
ansuz 920dbeabd1 add a save button
ansuz 4cc5388c76 trial run of canvas export via filesaver.js
ansuz f818d873bb remove usernames, refactor a wee bit
ansuz 2b8c21d292 set styles with setAttribute. fixes style fights
ansuz 36baf498ce fix magicline filter and strange interaction with cursor
ansuz 303e8d6c3e remove debugging line
ansuz 8af49698da add a class to the magicline markup so it's easier to remove
ansuz 48d222e565 depend on listmap api from bower
ansuz 1746a4e732 use crypto from bower
ansuz 2a3ff256b9 remove libraries which are now in bower
ansuz f72cb24fc5 rm LORIA
ansuz 2c3de49922 remove realtime-input, since it's in bower now
ansuz beba78d7f8 update prototype dependencies
ansuz 2798d1b1f9 all of the list/map api's dependencies are now on bower
ansuz 58c968b319 minor cleanup in realtime-input
ansuz 288b4d5b66 depend on main passing in the crypto module for now
ansuz f76dc615c0 use chainpad-crypto from bower and pass it into the listmap api
ansuz 85dbd5cb6e pass in websocketURL from main
ansuz d9a4f2f22c missed one
ansuz cf2866baa7 use json-ot from bower for tests
ansuz 5bb77bd50c add UI.add and UI.remove methods.
also use json-ot from bower
ansuz ff0f7d15dc use json-ot from bower
ansuz dccf5e8dcf use listmap api from common/
ansuz 58633af943 listmap can be reused. put it in common/
ansuz f80e9772a8 merge api.js and deep-proxy.js into one file
ansuz dbf1e2b870 support reusing the netflux network
export more internals from realtime input
ansuz 6f7543e9cc demonstrate chaining of 'on' directives
ansuz e44446f71e proper recursive proxy initialization
ansuz 68cec2348a don't prompt the user with a crypto hash for their name
ansuz 83696495a8 use chainpad from bower, not local
ansuz 2b9ac14cb1 restructure main to take advantage of new callback infrastructure
ansuz fea74782a2 remove a little more dead code that I missed
ansuz 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
ansuz 4222c0b516 simplify api
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
ansuz 954ee26f4d fix undefined disconnect reason
ansuz a0ec5eada8 better fix for magicline filter
ansuz 9336c4de5c import latest chainpad
ansuz d0b553d198 port Yann's multiple-select implementation to cryptpad
ansuz e3b8a10959 fix magicline filter
ansuz 058548b95a revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
ansuz 6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
ansuz 599f5aeec8 add sample listeners for debugging
ansuz 3afd144562 don't make noise when adding a listener
ansuz 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)
ansuz ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
ansuz 7c63219add fix some minor bugs
ansuz a0c73c95d8 do away with a bit of boilerplate
ansuz e189092ba8 document/spec the listmap api in its current/intended form
ansuz 55846044e1 rewrite underlying API. implement listeners
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad
ansuz 014dce272b working on better abstractions. still held together with duct tape
ansuz c1bca09cce move list/map functionality into wrapper file
ansuz f61d06fa18 first commit for listmap prototype
ansuz 774d349ec3 ignore hidden elements and submit buttons
ansuz cf85de6113 remove old bencoding code
ansuz d99bb8ff84 WIP : fallback to old parsing doesn't work
ansuz f04be53d11 fall back to old parsing if the message is bencoded?
ansuz 976a08cc7a move to chainpad version 2
ansuz 297d8c2d44 reformat code for jshint compliance
ansuz baf523e9a5 add new functionality from xwiki development
ansuz 0c89443c1b fix typo
ansuz 39fcd7dc4c more specific filtering for magicline plugin
to avoid false positives for other things which are non-contenteditable spans
ansuz cae750cd75 update padrtc for to use bower libraries
ansuz ad3c53c344 use textpatcher from bower for all pads
ansuz 0cd4f85ff0 remove migration notes
ansuz a7cbd8c470 we're pushing json over the wire, so let's use json-ot.validate
ansuz 3ea270acb9 fix cursors in form prototype
ansuz d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js
ansuz 663c157e2a expose text patcher to the window via APP
ansuz 1769ca16dc add example for configuring the logLevel in /pad/
ansuz 7faf57602b implement log level settings from application layer
ansuz 523aff3067 use upstream chainpad.js
ansuz dcd130cd9d use hyperjson from bower in padrtc
ansuz c752e4a6e5 remove sharejs
ansuz 6b2e986789 remove deprecated textsocket library
ansuz d2fa5e8f70 start using hyperjson from bower.io
ansuz 150ebaba7b add ability to force text diffing
ansuz aef6f3a85b lock codemirror editor until chain has synced
ansuz 6736335db2 add 'made with <3' toolbar to code
ansuz 506a703b7d turn off TextPatcher logging on /pad/
ansuz ba17b78f7a restyle name change button
ansuz d79b3616c9 remove unused files
ansuz 4c84758265 disable textpatcher logging
ansuz 46b009d20f remove last non-netflux pad
ansuz 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
ansuz 32d1807350 import unused functions from /p/, to be integrated later
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied
ansuz 626ecaffcd log browser fights in /pad/
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate
ansuz afe78dad56 Merge branch 'netflux' into beta
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux
ansuz a735d63306 migrate markdown rendering 'pad' to netflux
Yann Flory f5f8f6e1eb Remove the delay between a change and its propagation to chainpad
ansuz fa6914037c start rewriting codepad to use realtime-input
ansuz 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
Yann Flory fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
Yann Flory 53b2644b64 Fix a issue with fights over usernames
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz 255dc17a5d Merge branch 'beta' into netflux
ansuz f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz c14b86d84a add missing semicolon
ansuz b3ef2abb84 fix jshint complain
Yann Flory 85d5f5c47f Convert netflux to es5
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc
ansuz 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz c509c28c18 realtime form prototype, almost in good condition
ansuz 1a9e7299fc working state
ansuz 69e8f54e8f pass in Crypto to realtime-input
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence
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
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
ansuz be1ef7abe3 migrate canvas to netflux
ansuz d4943511fe move text/ and hack/ to Netflux
ansuz 4c95602347 remove a little bit more dead code
ansuz b140b6429d remove a little bit of dead code
ansuz 2c6cf9883b stop using deleted file
ansuz bbdc9da853 delete duplicated file
ansuz cce50390a0 don't depend on library to set hash
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
ansuz 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket
ansuz a527024a8c start on realtime form prototype
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
ansuz 04f6299938 reconcile differences with netflux
ansuz 565fb1d186 include small snippets for preventing browser fights
ansuz ffbd428b87 better logging of browser fights
ansuz 4d44661f3b more correct tests
ansuz a18c793f98 use latest hyperjson
ansuz 980ff8a0ca Fix a test that was failing on chrome
it failed for reasons which are irrelevant to our application
ansuz 9efcc443cd add 'format' to TextPatcher's API
ansuz 0769e50414 move TextPatcher to highest application layer
ansuz 1d70335228 provide all callbacks before starting
ansuz 9498937b43 add a FIXME to the assert page
tests were failing (unnecessarily) on Chrome
ansuz a3787ee4dc Merge branch 'netflux' into beta
ansuz 06b464c524 move sheet/ to .git
ansuz cdf02ac725 remove input pad
ansuz 11961b4f1d export stringifyDOM to REALTIME_MODULE
ansuz 5db487db3f remove old pad entirely
hyperjson version is considered a strict improvement
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored.
ansuz 1639c5b099 use hyperscript and hyperjson from common
ansuz 3598c93098 move new hyperjson into common
ansuz 103bb69daa move custom hyperscript into common
ansuz e357549eda push browser fights into an array for inspection
ansuz b83fb7b823 improve brFix logic
stop exporting functions which we wish to deprecate
ansuz 1c7954ed51 Grab Fabric off of the window
ansuz 06786b6e02 Remove redundant declaration
ansuz df22c246c4 serialize text nodes correctly
ansuz 7ca5f47d02 remove multitest pad since it offers no significant benefit
ansuz bafdd588dd fix /hack/ to not require sharejs textarea
ansuz f2db6b83eb better sizing for palette options
ansuz 5ce158d2e2 add more colors
ansuz 7c4b334ad3 here's a canvas app!
ansuz 41276fffb5 repair /text/ application, conform to new API
ansuz cb979844f6 implement text patching at application layer
ansuz 4a41575e6d accept onLocal in config
ansuz d3c2c901b6 implement cursor transformation in a common library
ansuz 92d89f6cac start to factor sharejs into two modules
ansuz 13dc77b7f6 remove commented line
ansuz 41e635b2e5 realtime-input.js : turn on logging
Yann Flory 69e8e18283 Remove the pipe character in the hash
ansuz d62e9fc1c9 add a missing semicolon
ansuz 4095201d15 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time
ansuz 822b2bd2b9 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
Yann Flory be09a1808d Remove old code from realtime-input
ansuz 5a5b9ad718 Merge branch 'netflux' into beta
ansuz 4af987a2a2 point to correct toolbar.js
ansuz 3ade46adc7 Merge branch 'newtests' into beta
Yann Flory 6884b0890a Fix the typong tests not working properly
ansuz b12a01e08f report test results on the page, not in the console
ansuz feaae609ad fix broken path for padrtc
Yann Flory ecc41d14af Use canonical serializer for json serialization
ansuz fc77ef66b3 Merge remote-tracking branch 'origin/sortify' into HEAD
utilize canonical stringify function

Conflicts:
	www/_socket/main.js
Caleb James DeLisle 319f5b95f7 Use canonical serializer for json serialization
Yann Flory 9683fd9aec Always serialize the DOM in one way.
Caleb James DeLisle 698338b49a Use canonical serializer for json serialization
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux
ansuz 468827dadd newest tests
ansuz c867ab04ab rename /_socket/ app to /p/
ansuz a1fe941f69 Always serialize the DOM in one way.
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs
ansuz 259772dd62 Turn on TextPatcher logging for _socket
ansuz 0537c28919 Add switchable logging to TextPatcher.js
Caleb James DeLisle 8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness
ansuz 284da6a4e9 minor improvements I made to the /hack/ pad last night
ansuz 9f0cc4ed64 update hack with a slightly better UI
ansuz 71c0a06c3b Merge branch 'hack' into diffdom
ansuz 19cd991dba trim dead code, comment, very minor optimizations
ansuz f75c246029 remove dead code from pad/main.js
ansuz 9f45ccb2d9 use console.error for stack traces
ansuz d705b947ab Merge branch 'diffdom' into netflux
basic cleanup while performing a larger merge between two prototypes
ansuz 2ffa69dc15 remove checks for a non-existent race condition
ansuz 368d72b337 add missing semicolons to TextPatcher.js
ansuz 851ccfbdb6 detect falsey operations in OT and ignore them
ansuz 400f6efde1 json-ot.js : jshint compliance
ansuz a0999d1d2b add a comment about why hashes are being stubbed
ansuz ca94d30386 detect falsey operations in OT and ignore them
ansuz 9f9cd8d8cd realtime-input.js : fixes for jshint compliance
ansuz 793149a608 json-ot.js : jshint compliance
ansuz 06a3b63923 jshint compliance for toolbar.js
ansuz 3b8238ef3b add missing semicolons to pad/main.js
jshint compliance
ansuz 5cead3fad3 add missing semicolons to TextPatcher.js
ansuz e6ab03164c import TypingTests.js and expose at the console
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
ansuz 94e57e4a26 update location of text-patcher.js
ansuz b37dab1f49 Merge branch 'diffdom' into netflux
Simple cleanup and unit tests
ansuz 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
ansuz 6bb37aed44 main.js : support tab insertion in /hack/ pad
ansuz 6b9d982d40 stabilize _socket/realtime-input.js
...as common/RealtimeTextSocket.js
ansuz 1a22592afa remove unused modules from realtime-input.js
ansuz 39071021eb stabilize typingTest.js as /common/TypingTests.js
ansuz 9805958ad7 stabilize text-patcher.js into /common/TextPatcher.js
ansuz 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.
ansuz 7782069dbd Merge pull request from xwiki-labs/diffdom
merge diffdom into netflux
ansuz a1f9b10175 remove offending line from chainpad entirely
RTCHAINPAD-3
ansuz 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.
ansuz 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