787 Commits (fe2fef5e4cd43d078ef0311dbb1618615e96bdeb)

Author SHA1 Message Date
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 8 years ago
yflory 404fa378e6 Move the store to the 'common' folder, it is not customizable anymore 8 years ago
yflory 0c1efd361b Make sure the href is updated everywhere when importing a stronger link 8 years ago
yflory b701e3cc85 Fix lint errors 8 years ago
yflory 4206382865 Fix the settings app to allow backup for unregistered users 8 years ago
yflory f62267f8a1 Ability to import local pads in the user object 8 years ago
ansuz e2418a6be2 sketch of how pinning rpc will look 8 years ago
ansuz dc567fa7f3 signing keys are stored in hex so encode and decode them 8 years ago
yflory 9ad33574e9 Fix the function returning the pads list in the drive 8 years ago
yflory d93a270336 Ability to display tips in the loading screen 8 years ago
yflory 77d09f64e1 Display anonymous users in the user list 8 years ago
yflory cb88227e2b Autocomplete on key press in some dropdown menus 8 years ago
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 8 years ago
yflory ed9bcca96f Close the websocket network when CryptGet/CryptPut is done 8 years ago
ansuz 0bb10a8a0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e1303a16da add support for title attributes on dropdowns 8 years ago
yflory 52793385ea Fix lint errors 8 years ago
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 8 years ago
ansuz c884782d57 here are some changes 8 years ago
yflory 9a7c2dd5e2 Add a 'settings' link to the user menu in static pages 8 years ago
yflory c5f983ecd7 Convert read-only link to editing link in the drive 8 years ago
ansuz a9afa24428 return empty string instead of blowing up when fixing HTML 8 years ago
yflory 8bdc8415ab Find a pad in the drive 8 years ago
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
8 years ago
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 8 years ago
ansuz cb5e01815c validate all alertify strings by default. require 'force' argument to bypass 8 years ago
yflory 2c5c6da0d9 Fix XSS in alertify logs 8 years ago
yflory 5797aab3f2 Fix XSS with display names in the user list 8 years ago
yflory 26e3971482 Fix XSS in the user dropdown menu 8 years ago
ansuz 5d39125004 Make onSettle Async Again 8 years ago
yflory 4f4075ed6e Make the settings app available to anonymous users 8 years ago
ansuz 12aec60a12 hack around onSettle not doing its job 8 years ago
ansuz 1a259bb3aa check if user has disallowed feedback api 8 years ago
yflory 498f4065cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 66dc166936 Make sure the realtime is synced with onSettle when using cryptget 8 years ago
ansuz de5a21fe57 add a simple feedback api and text explaining what it is 8 years ago
yflory 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 5303e76ece Make sure the content is correctly applied in onReady 8 years ago
ansuz cc829d51f8 jshint compliance 8 years ago
yflory 42b6cca18d Fix new pad not working 8 years ago
yflory 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive 8 years ago
yflory e15a6a347f Fix the forget pad button 8 years ago
yflory 54b0a86c2e Make sure we redirect to the drive if we access the login page from the homepage 8 years ago
yflory ba0b314f5e Fix the 'new' button in drive which was broken in non root categories 8 years ago
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 8 years ago
ansuz 7e77c6828a more correct pluralization 8 years ago
yflory c72bbd4c37 Use the file name as initial title 8 years ago
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 8 years ago
yflory 11d9c9e813 Merge branch 'master' into staging 8 years ago
yflory 2103f0afa8 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
yflory 0bdf59c1dd Fix broken link in the 'New' button on cryptpad.fr 8 years ago
yflory d81d17b86c Remove old translations keys no longer used 8 years ago
yflory 239e2bcc1f Fix issue with null entries in Cryptpad_RECENTPADS 8 years ago
yflory 1540ae3f6f Fix issue with null entries in Cryptpad_RECENTPADS 8 years ago
ansuz 94417d9a8b jshint compliance 8 years ago
ansuz c9b8889380 add cache-busting to chainpad-crypto 8 years ago
ansuz 09fade6127 add cache-busting to chainpad-crypto 8 years ago
yflory 2daa9f8658 Link to main page was opened in the inner iframe 8 years ago
yflory deda40375a Use the new onSettle from chainpad to determine if the realtime is synced 8 years ago
yflory 92d50ded64 Merge branch 'soon' into staging 8 years ago
yflory 97762f9f9a Make sure all the elements in RECENTPADS are non-null objects 8 years ago
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 8 years ago
yflory 7762ffcbff Ability to use Ctrl+click on the cryptpad logo in apps 8 years ago
yflory 7497e0d1c5 Add a dropdown user menu to the top bar in static pages 8 years ago
yflory 7758d056fa Ability to import/export a user realtime object 8 years ago
yflory cd9cea8fa4 Create a settings app to manage user objects 8 years ago
yflory 71b84afdb2 Redirect to the pad when logging in or signing up from a pad 8 years ago
yflory 92050eb04f Fix the trash button in toolbar not always working 8 years ago
yflory aae3fba284 Fix the storage when the hash is invalid 8 years ago
yflory b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 3aa03225c9 Add a spinner when hashing the password and translate homepage 8 years ago
ansuz fbcf4ccec4 force usernames to be lowercase 8 years ago
ansuz 5614bea271 redirect users to login and register from toolbar 8 years ago
ansuz f723585758 add api to check whether the realtime has synced with the server 8 years ago
ansuz d0edf75c89 signup link directs users to register page, not user 8 years ago
ansuz 1232aa8a79 jshint compliance 8 years ago
yflory 8eec7ec7c8 Fix typo 8 years ago
ansuz f92ba193c3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e100110741 implement log in as an api 8 years ago
yflory f8366e0cfc Remove support for legacy store and add a way to import legacy pads 8 years ago
yflory 67d881b2cf Remove the drive entry from the user menu if already in drive 8 years ago
yflory 914c442615 Do not redirect to home page when logging out from another tab 8 years ago
yflory 702798f65a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1e2cc6bea4 Fix race condition with the iframe store 8 years ago
ansuz 6e97082ff9 remove dead code from login function 8 years ago
ansuz 8a1acc3c37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 6f07a3b7b4 erase lingering sessionStorage values when logging out 8 years ago
yflory ac79fbb5a2 Improve mobile support for the toolbar and the drive 8 years ago
yflory 9f1789b2d2 Fix creation of pads from non-root category in the drive 8 years ago
yflory ad82a275bc Replace the Apps button by a New button again 8 years ago
yflory fd33ffd56f Fix issue creating a patch everytime the user clicked in an app 8 years ago
yflory 87abfac5e0 Fix lint error 8 years ago
yflory 02439e0f61 Improve the homepage with new images and translations 8 years ago
yflory 2c6b4b9c6a Hide disabled applications from the context menu in drive 8 years ago
yflory 91299f5f30 Ability to access the drive from any pad 8 years ago
yflory b0fb56fa63 Allow logge din users to access the home page 8 years ago
yflory 65054119cf Fix a bug preventing reconnection in drive 8 years ago
yflory 757ae7a3ad Fix a cross origin frame issue with dropdowns 8 years ago
yflory 39c85ca3f7 Fix race condition causing missing translations in homepage 8 years ago
yflory 5e69b78334 Remove the domain from the href in store 8 years ago
yflory 58d8a30b5b Redirect to the main page when logging out 8 years ago
yflory 5ef074370b Name a place before creating it in the drive 8 years ago
yflory 0e9e0e545f Load the new pad when the hash is changed 8 years ago
yflory e41cbb92d8 Use default FILES_DATA name if not provided 8 years ago
yflory c44f3a1044 Delete multiple elements could also remove unselected ones 8 years ago
yflory 3f44444f41 Display the 'New' button in the trash 8 years ago
yflory 11f0a9ae5f Revert the changes adding anonymous pads 8 years ago
yflory f42665ba49 Remove the unowned pads category 8 years ago
yflory cb85ad3fdf Merge branch 'newtoolbar' into ownedpads 8 years ago
yflory 373b07ed28 Fix lint errors 8 years ago
yflory 015e6fc262 Make sure we have the same hash in all the tabs when disconnecting 8 years ago
yflory 88021f2264 Anonymous pads fo anonymous users 8 years ago
yflory 9d275daebb Backport changes for the login page from hpbs branch 8 years ago
yflory 99b8898e54 Apply new title when clicking on the page without pressing enter 8 years ago
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 8 years ago
yflory a9063e0459 Reload all tabs when the user logs in or out 8 years ago
yflory efed1f5efe Add handlers to login and logout buttons 8 years ago
yflory 767ba8b549 Select what we want to display in the toolbar 8 years ago
yflory 2afdc11327 Replace the username button by a dropdown menu 8 years ago
yflory 4adde0f0c0 Use the new dropdown for userlist and share 8 years ago
yflory efffd4974f Add createDropdown and createLanguageSelector in cryptpad-common 8 years ago
yflory 29c8f0bbef Use a FontAwesome spinner to replace the old unaligned one 8 years ago
yflory 3f1e287811 Fix an issue causing a user object to be turned into a pad 8 years ago
yflory 569ea21705 Replace the language selector by our custom dropdown menu 8 years ago
yflory 26dd4ea11f Fix lint errors 8 years ago
yflory 4278ac7637 Merge branch 'soon' into fileManager 8 years ago
yflory 2be5db9540 Ability to open files in readonly mode
Fix CSS issues
8 years ago
yflory f74d0a46a4 Remove the alert when pressing del in 'all files' 8 years ago
ansuz 1c3f1a15cd make sure that /pad is resized after loading 8 years ago
yflory 5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
8 years ago
yflory d5561910d4 Move the file manager into /drive and add a toolbar 8 years ago
yflory 1e70af0c16 Use the same network for the apps and the file store 8 years ago
ansuz e56cc49f79 catch errors that popped up because of a cross-origin iframe 8 years ago
ansuz 5cd714b18a configure filestore usage via customize/application_config.js 8 years ago
ansuz 91a806ab86 focus on OK button when we pop an alert 8 years ago
ansuz 89e5830409 make alertify display time configurable 8 years ago
ansuz 5e1d8292c5 guard against trying to parse special fragments 8 years ago
ansuz 52a593c2c2 fix jshint complaints 8 years ago
ansuz 53a4d4738a really make sure you're logged out 8 years ago
ansuz 5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 8 years ago
yflory 9b6c9e3891 Add support for templates in the file manager 8 years ago
ansuz 29d406b7a9 implement cryptput 8 years ago
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 8 years ago
ansuz 1682d23c1c remove old user prototype 8 years ago
yflory c359c27997 Use user object as default store in file manager 8 years ago
yflory 4aed585574 Fix style issues in the toolbar 8 years ago
ansuz bd6992da0a create a random hash 8 years ago
ansuz 2cd50498c2 add log(in|out) functions to common 8 years ago
ansuz 7df460c766 implement createChannelId api 8 years ago
ansuz 5a14db9f07 Merge branch 'test-filemanager' into login 8 years ago
ansuz 303953a431 Merge branch 'soon' into login 8 years ago
ansuz 6b9529b121 implement ajax-like functionality for zk docs 8 years ago
yflory 5bc7766f44 Use a consistent toolbar across all apps 8 years ago
ansuz 2968488278 convert uint8 arrays to hex 8 years ago
yflory 8e6830d080 Fix file manager with a chosen hash 8 years ago
yflory ee56f5608f Fix the infinite spinner bug with the file manager store 8 years ago
yflory 43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 8 years ago
yflory 05fd6c1563 Fix the infinite spinner problem 8 years ago
yflory cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 8 years ago
yflory 9b3719e0ae Merge branch 'soon' into fileManagerMerge 8 years ago
yflory 6dff82ede2 Improve UI, scrollbar in the table, publish/admin buttons 8 years ago
yflory 90804ed9e0 Add usernames/userlist in the toolbar and fix publish button 8 years ago
yflory 5a5451d94c Sort elements in the trash, add properties in the context menu, fix issue with Edge 8 years ago
yflory a957b72598 Create a new pad from the file manager 8 years ago
yflory d6e1215166 Refresh the directory if needed when the object has changed 8 years ago
yflory 118829617f Use the FS store as default store 8 years ago
ansuz c2770a7a74 set correct hash even if browser does not implement replaceState 8 years ago
ansuz 303c65f2c3 use replaceState if available, instead of setting the hash 8 years ago
ansuz 2d5448458b export messages 8 years ago
ansuz d512b113cd address failure to parse url when hash is not present 8 years ago
yflory ab1d3958ce Add a pencil icon when hovering the title 8 years ago
yflory 6d1e06cca3 Add notifications when a user joins or leaves the channel 8 years ago
yflory 54a63267cd Add a share button and merge the viewers and editors buttons 8 years ago
yflory 87d86384ac Fix broken elements in the new toolbar 8 years ago
yflory 6351d1856f Remove the top bar and move its content in the applications' toolbars 8 years ago
yflory 3d74290c7d Merge branch 'usability5' into staging 8 years ago
yflory 9e92a597b3 Ability to edit the title in the toolbar by clicking it 8 years ago
ansuz a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 8 years ago
Yann Flory 10bb5e1607 Add the title in the toolbar 8 years ago
Yann Flory 1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad 8 years ago
yflory 51a79c5218 Remove unused dependency 8 years ago
yflory 9a733bb360 Fix dropdown menus with Edge 8 years ago
yflory 39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 8 years ago
yflory 24fbe22c9d Improve the toolbar style and the way the userlist is displayed 8 years ago
yflory d2389a5729 Change the userlist in the toolbar 8 years ago
yflory 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 8 years ago
ansuz bb2317d8e6 fix chrome style bug by forcing reload of style sheet 8 years ago
yflory 765498e88e Remove the support for old.cryptpad.fr 8 years ago
yflory c322aa440e Fix the username icon hcih was not working anymore 8 years ago
yflory 8575f3f79f Fix the "rename" feature which was not working anymore in some cases 8 years ago
yflory a989b51d74 Fix race conditions with Alertify 8 years ago
yflory 74df38f94f Fix race conditions that could prevent applications from being loaded 8 years ago
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance 8 years ago
yflory a30e17121d Merge branch 'readonlyButton' into soon 8 years ago
yflory e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 8 years ago
ansuz 2ac1b02572 Merge branch 'config-sockets' into soon 8 years ago
ansuz 3dfa19b786 more flexible websocket configuration (WIP) 8 years ago
yflory 76fdadee7f Store only the strongest hash in the localstorage 8 years ago
yflory 17b4f91810 Do not share the title in the doc if it is the default title 8 years ago
yflory 391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
8 years ago
yflory 8c33218ceb Move the codemirror themes in /common 8 years ago
Yann Flory 2609af2105 Use the CodeMirror editor in the slide application 8 years ago
yflory f03018f3bc Improve the top bar and use the font awesome icons in /code 8 years ago
yflory 3d54413343 Improve the UI with FontAwesome icons 8 years ago
ansuz d6525087c7 jshint compliancy 8 years ago
yflory d46bd1af5c Improve the toolbar UI with the username displayed 8 years ago
yflory 79884e2400 Use the same username for all pads 8 years ago
yflory dde519795d Merge branch 'newhash' into newhashNoConflict 8 years ago
ansuz f29e3d7b0d don't let notifications interfere with document titles 8 years ago
yflory 83705ae058 Improve the UI in read-only mode 8 years ago
ansuz fa8199bc75 don't try to use experimental user code 8 years ago
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 8 years ago
Yann Flory 42f14873cd Merge branch 'translations' into newhashmerge 8 years ago
Yann Flory 391b7690e6 Set the pad to readonly mode when using a 'view' url 8 years ago
Yann Flory 368e253c9f Ability to send a read-only URL 8 years ago
yflory 5c63585952 Complete the French translation 8 years ago
yflory 0d9f63b977 Merge branch 'translations' - part one 8 years ago
yflory f086492e50 Improve the localization system
Improve and enable the French translation
8 years ago
yflory 25c8d16bf5 Use a new version-prefixed hash parser 8 years ago
yflory c736caceba Use a better default pad title 8 years ago
ansuz 97415d8158 Merge branch 'users' 8 years ago
ansuz 8e86be81b2 Merge branch 'better-slides' 8 years ago
ansuz fb21b4e46b fix up /render/ 8 years ago
ansuz 4941c1493e better user integration. a few more common utils 8 years ago
ansuz 30ea1b59b7 integrate users into common utilities 8 years ago
ansuz 6d775f61c6 add missing functions 8 years ago
ansuz 168338b898 add missing functions 8 years ago
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz f40b798d88 Merge pull request #30 from xwiki-labs/reconnect
Ability to reconnect after a connection failure
8 years ago
yflory c168ce2d1c Ability to reconnect after a connection failure 8 years ago
ansuz 1bec02239c coerce dates into strings 8 years ago
ansuz 0add01a940 remove dead code 8 years ago
ansuz 8c914dfe1f better filenames 8 years ago
ansuz 7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain 8 years ago
ansuz 5131f47cca jshint compliance 8 years ago
ansuz 306d524416 fix broken removal call 8 years ago
ansuz dd3a5d47be migrate localStorage so people go to cryptpad.fr 8 years ago
ansuz a094e3c02e use correct store api calls in frame.js
also don't log unnecessarily
8 years ago
ansuz dcc9810a42 avoid extra call to store if there are no keys to remove 8 years ago
ansuz 9a5294016d fix incorrect usage of store api 8 years ago
ansuz 4e5f381325 add spinner to API. update bower deps 9 years ago
ansuz fa654a7646 slightly better regex 9 years ago
ansuz cd18075ac7 add some redirection logic to support old hash types 9 years ago
ansuz 600f3151e9 don't use the store until it's ready to be used 9 years ago
ansuz fffa9acf15 remove unused files from fs and jshintignore 9 years ago
ansuz 551d38c930 let the abstraction take care of stringification 9 years ago
ansuz 0ada6a3d0a jshint compliance. gotta keep those tests green 9 years ago
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
9 years ago
ansuz 7f02c899ea add snippet for copying text to the clipboard 9 years ago
ansuz 42eafe9e29 don't create duplicate stylesheets in the document head 9 years ago
ansuz c6bdb7506d forget everything about a pad when you forget it 9 years ago
ansuz e84fbf0bc3 more helpers in common 9 years ago
ansuz ff74a67a09 translate alertify button messages 9 years ago
ansuz d39ab5c250 point to the actual translation file 9 years ago
ansuz dea8e225db fix double scrollbar issue 9 years ago
ansuz 3eccec7054 better effort for translation 9 years ago
ansuz cbeaa8d609 major refactoring for toolbar. CAN HAZ LESS 9 years ago
ansuz 7504f79e05 add log and warn methods to cryptpad common 9 years ago
ansuz 3ad5d71ab1 make sure the regular favicon is set 9 years ago
ansuz fd3cd73d0b try to fix favicon bug 9 years ago
ansuz 589b0087a1 listen for keyup events while alertify prompts are active 9 years ago
ansuz deae7ac78f don't hide the notification until it has been seen 9 years ago
ansuz 3d3c6e4800 add wrappers for alertifyjs 9 years ago
ansuz 73d2b6561a add small modules for page visibility api and notification apis 9 years ago
ansuz d8b467422a fix default title in localStorage migration 9 years ago
ansuz 7a5877d12a don't filter pads after 30 days 9 years ago
ansuz d844551fba add a forget button. clean up toolbar a bit 9 years ago
ansuz 8a82e11306 make sure title is defined for home page usage 9 years ago
ansuz 71b1f71ba0 fix migration to include ctime 9 years ago
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
9 years ago
ansuz a3da10766a add rename button to /code/ and /pad/ 9 years ago
ansuz 93dcf29c15 more functions for working with localstorage 9 years ago
ansuz d025d13295 address some jshint complaints 9 years ago
ansuz 12bbf3e8f6 don't drop values onto the window 9 years ago
ansuz ca45e3533d pass loaded file to callback when importing 9 years ago
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
9 years ago
ansuz 31aa09d6f6 work a bit more on import/export and code highlighting 9 years ago
ansuz 242c9a99e3 implement import and export in /pad/ 9 years ago
ansuz 0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 9 years ago
ansuz c3d2568d3c add file export for codepad
addresses #24
9 years ago
ansuz 2b8c21d292 set styles with setAttribute. fixes style fights 9 years ago
ansuz 1746a4e732 use crypto from bower 9 years ago
ansuz 2a3ff256b9 remove libraries which are now in bower 9 years ago
ansuz f72cb24fc5 rm LORIA 9 years ago
ansuz 2c3de49922 remove realtime-input, since it's in bower now 9 years ago
ansuz 2798d1b1f9 all of the list/map api's dependencies are now on bower 9 years ago
ansuz 58c968b319 minor cleanup in realtime-input 9 years ago
ansuz 288b4d5b66 depend on main passing in the crypto module for now 9 years ago
ansuz 85dbd5cb6e pass in websocketURL from main 9 years ago
ansuz d9a4f2f22c missed one 9 years ago
ansuz ff0f7d15dc use json-ot from bower 9 years ago
ansuz 58633af943 listmap can be reused. put it in common/ 9 years ago
ansuz dbf1e2b870 support reusing the netflux network
export more internals from realtime input
9 years ago
ansuz 83696495a8 use chainpad from bower, not local 9 years ago
ansuz 954ee26f4d fix undefined disconnect reason 9 years ago
ansuz 9336c4de5c import latest chainpad 9 years ago
ansuz 058548b95a revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
9 years ago
ansuz 6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
9 years ago
ansuz ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 9 years ago
ansuz a0c73c95d8 do away with a bit of boilerplate 9 years ago
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad 9 years ago
ansuz cf85de6113 remove old bencoding code 9 years ago
ansuz d99bb8ff84 WIP : fallback to old parsing doesn't work 9 years ago
ansuz f04be53d11 fall back to old parsing if the message is bencoded? 9 years ago
ansuz 976a08cc7a move to chainpad version 2 9 years ago
ansuz cae750cd75 update padrtc for to use bower libraries 9 years ago
ansuz 7faf57602b implement log level settings from application layer 9 years ago
ansuz 523aff3067 use upstream chainpad.js 9 years ago
ansuz c752e4a6e5 remove sharejs 9 years ago
ansuz 6b2e986789 remove deprecated textsocket library 9 years ago
ansuz 150ebaba7b add ability to force text diffing 9 years ago
ansuz ba17b78f7a restyle name change button 9 years ago
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 9 years ago
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 9 years ago
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 9 years ago
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
Yann Flory 85d5f5c47f Convert netflux to es5 9 years ago
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad 9 years ago
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence 9 years ago
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
9 years ago
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
9 years ago
ansuz b140b6429d remove a little bit of dead code 9 years ago
ansuz bbdc9da853 delete duplicated file 9 years ago
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
9 years ago
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket 9 years ago
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
9 years ago
ansuz a18c793f98 use latest hyperjson 9 years ago
ansuz 9efcc443cd add 'format' to TextPatcher's API 9 years ago
ansuz 0769e50414 move TextPatcher to highest application layer 9 years ago
ansuz 1d70335228 provide all callbacks before starting 9 years ago
ansuz a3787ee4dc Merge branch 'netflux' into beta 9 years ago
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored. 9 years ago
ansuz 3598c93098 move new hyperjson into common 9 years ago
ansuz 103bb69daa move custom hyperscript into common 9 years ago
ansuz b83fb7b823 improve brFix logic
stop exporting functions which we wish to deprecate
9 years ago
ansuz cb979844f6 implement text patching at application layer 9 years ago
ansuz 4a41575e6d accept onLocal in config 9 years ago
ansuz d3c2c901b6 implement cursor transformation in a common library 9 years ago
ansuz 92d89f6cac start to factor sharejs into two modules 9 years ago
ansuz 13dc77b7f6 remove commented line 9 years ago
ansuz 41e635b2e5 realtime-input.js : turn on logging 9 years ago
Yann Flory 69e8e18283 Remove the pipe character in the hash 9 years ago
ansuz d62e9fc1c9 add a missing semicolon 9 years ago
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time 9 years ago
Yann Flory be09a1808d Remove old code from realtime-input 9 years ago
Yann Flory 6884b0890a Fix the typong tests not working properly 9 years ago
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux 9 years ago
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs 9 years ago
ansuz 259772dd62 Turn on TextPatcher logging for _socket 9 years ago
ansuz 0537c28919 Add switchable logging to TextPatcher.js 9 years ago