Commit Graph

618 Commits (6bc1c24608626dbe74b2295d4e9592f681f6c428)

Author SHA1 Message Date
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable
yflory 92ea03d7d9 View and restore the history of a pad
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
ansuz 50277cb0ae don't rely on 'info' in onRemote so we can call it anywhere
ansuz df4a250359 use feedback api instead of app=
yflory 84d8615cf1 Save and use templates in pad, code and slides
ansuz 233bb7a14f reorganize some html tags for smaller diffs
yflory 71c59d7ae2 Remove unnecessary TODOs
yflory d92a875ce5 Translate the 'wrong application' error message
yflory a8ffac5dcd Remove old code
ansuz 912215185f add uid to userdata for better notifications
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls
ansuz 6e733b1329 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded
ansuz 8a48612de2 add some notes for later
ansuz c04819538b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz fcb9848b3a hide toolbar when in read-only mode
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it
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.
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements
yflory 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
yflory 11d54256da Make sure the display name is displayed in the same way everywhere
ansuz 639376f1cb don't use hyperjson.toString
ansuz 86adfbf27d update cache-busting directive in all supported apps
yflory 8741b50f5b Set the file name as default title if a pad is created from the drive
yflory e38df7ce47 Fix creation of new pads in /pad
yflory f8d653406a Add the new content for the default pad and add french translation
yflory d4bf7cf9aa Send the initial state only if it is a new pad in /pad
yflory fadddb297c Readonly mode in /pad had contenteditable set to true
yflory 88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 5303e76ece Make sure the content is correctly applied in onReady
ansuz cc829d51f8 jshint compliance
yflory e15a6a347f Fix the forget pad button
yflory a0340f1419 Open link in a new tab in /pad
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu)
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js
yflory c72bbd4c37 Use the file name as initial title
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common
yflory c17f28e5fe Fix race condition
ansuz 8167ed9048 implement cache-busting everywhere
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name
yflory 2851ceb95a Merge branch 'soon' into staging
ansuz 1232aa8a79 jshint compliance
ansuz a995df25f6 disable new OT in pad and code app
yflory d54262c8df Use the same disconnecter error translation key for all the apps
yflory 3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space
yflory 914c442615 Do not redirect to home page when logging out from another tab
yflory 02439e0f61 Improve the homepage with new images and translations
yflory a4286f1c83 Merge branch 'soon' into newtoolbar
yflory 373b07ed28 Fix lint errors
yflory ce1e792419 Merge branch 'soon' into newtoolbar
yflory 69fb8b4d2f Merge branch 'master' into soon
yflory f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes
yflory 1e1bfd275c Don't show the tab notification when someone has joined the pad
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar
yflory a9063e0459 Reload all tabs when the user logs in or out
yflory efed1f5efe Add handlers to login and logout buttons
yflory 767ba8b549 Select what we want to display in the toolbar
yflory 2afdc11327 Replace the username button by a dropdown menu
yflory 4adde0f0c0 Use the new dropdown for userlist and share
Brandon Istenes b5acdb8cc0 Disable zooming on mobile
Brandon Istenes 40985f1811 Dubious height setting for iOS
Brandon Istenes 52d8d8db1d Get rid of margins on mobile
Brandon Istenes cd0931c951 UI improvements for mobile browsers
yflory 605072cfbf Fix empty title with new documents
yflory 4963c77b61 Fix the title reset bug
Caleb James DeLisle 6c5e8d3118 Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
yflory 569ea21705 Replace the language selector by our custom dropdown menu
yflory 4278ac7637 Merge branch 'soon' into fileManager
ansuz b39067d2a1 jshint compliance
ansuz 1c3f1a15cd make sure that /pad is resized after loading
yflory 5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
ansuz a3cd100c94 apply yflory's safari patch
yflory 1e70af0c16 Use the same network for the apps and the file store
ansuz b33661d9d5 don't toggle maximization state after setting
ansuz f020fd5a75 remove /customize/pad.js from main apps
ansuz e9376a66c2 apply 'cp' class for unified styles
yflory 1772cc93c8 Fix the taildoc bug
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc)
yflory 4aed585574 Fix style issues in the toolbar
ansuz 8a7fda6341 Merge branch 'soon' into login
ansuz a220742f68 fix reversed color settings
ansuz 308db7fa79 fix uncolored /pad/ content in IE
ansuz f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
yflory ee56f5608f Fix the infinite spinner bug with the file manager store
yflory 05fd6c1563 Fix the infinite spinner problem
ansuz de0863e232 use new ot
ansuz 4cd9bd5534 strip listeners
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 303c65f2c3 use replaceState if available, instead of setting the hash
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 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 46c5f64369 remove absent users from the userlist
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 e739c49e7f Remove the 'about' button in ckeditor
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 5e76194262 use new config api
yflory 76fdadee7f Store only the strongest hash in the localstorage
yflory 17b4f91810 Do not share the title in the doc if it is the default title
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
ansuz d6525087c7 jshint compliancy
ansuz ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
ansuz a82b7aaf8b allow empty names
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 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
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 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 25c8d16bf5 Use a new version-prefixed hash parser
ansuz 7c5ee53e81 resolve conflict and merge
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad
yflory c168ce2d1c Ability to reconnect after a connection failure
ansuz e386749e89 unlock the editor after your name has been set (or not)
ansuz 2d5caf38d9 show a spinner until the document has loaded
ansuz fd0a7337a3 wait a full minute until requirejs times out
ansuz 600f3151e9 don't use the store until it's ready to be used
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 4833cf0d7b add a fontpicker
ansuz 6cb2f72aa6 pretty print html during export if possible
ansuz fe3f02f5e0 enable text foreground and background colors
ansuz 992bc4f449 add missing script
ansuz a995f2306d fix undefined variable reference
ansuz 44fe95c76b add titles to buttons on pad and code
ansuz d39ab5c250 point to the actual translation file
ansuz 3eccec7054 better effort for translation
ansuz 18ce69b756 use constants from toolbar.js, address linter warnings
ansuz 750731d3db workaround for favicon magic
ansuz fd3cd73d0b try to fix favicon bug
ansuz a2a8570453 use alertify UI in /pad/
ansuz 85702f2706 inform users of changes in /pad/ too
ansuz 6075849ed7 add favicons to /pad/ and /code/
ansuz 7e8d66a141 filter unwanted elements when receiving patches
ansuz d844551fba add a forget button. clean up toolbar a bit
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 a3da10766a add rename button to /code/ and /pad/
ansuz 908e79c0b9 add autolink plugin
ansuz d025d13295 address some jshint complaints
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 849683d586 update to use new style crypto module
ansuz 69f3f4c9a8 drop hyperscript dependency
ansuz f818d873bb remove usernames, refactor a wee bit
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 beba78d7f8 update prototype dependencies
ansuz ff0f7d15dc use json-ot from bower
ansuz 68cec2348a don't prompt the user with a crypto hash for their name
ansuz a0ec5eada8 better fix for magicline filter
ansuz e3b8a10959 fix magicline filter
ansuz 297d8c2d44 reformat code for jshint compliance
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 ad3c53c344 use textpatcher from bower for all pads
ansuz d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js
ansuz 1769ca16dc add example for configuring the logLevel in /pad/
ansuz d2fa5e8f70 start using hyperjson from bower.io
ansuz 506a703b7d turn off TextPatcher logging on /pad/
ansuz 32d1807350 import unused functions from /p/, to be integrated later
ansuz 626ecaffcd log browser fights in /pad/
Yann Flory 53b2644b64 Fix a issue with fights over usernames
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc
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
ansuz 4c95602347 remove a little bit more dead code
ansuz cce50390a0 don't depend on library to set hash
ansuz 0769e50414 move TextPatcher to highest application layer
Yann Flory 69e8e18283 Remove the pipe character in the hash
Yann Flory 6884b0890a Fix the typong tests not working properly
Yann Flory ecc41d14af Use canonical serializer for json serialization
Yann Flory 9683fd9aec Always serialize the DOM in one way.
ansuz f75c246029 remove dead code from pad/main.js
ansuz a0999d1d2b add a comment about why hashes are being stubbed
ansuz 3b8238ef3b add missing semicolons to pad/main.js
jshint compliance
ansuz e6ab03164c import TypingTests.js and expose at the console
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
Yann Flory 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
Yann Flory cf9f60bd57 The server don't send back anymore messages to their sender
Yann Flory ba4faea939 Update the pads to run with the latest improvements to the websocket server
Yann Flory 5ef7e29a9b Add the latest changes from _socket into the netflux pad
Yann Flory de6db0285c Limit the size of the usernames to 32 chars
Yann Flory 7237c751d5 Move 'vdom' to the main 'pad'.
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
ansuz 3cb94b8d80 jshint compliance
ansuz f1915d3b7c fix jshint complaints in pad directory
ansuz 967d636df9 address more jshint complaints
ansuz c71b060dc2 main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time.
Caleb James DeLisle 51544db9a2 Completed adding of customization system and bottom infobar
Caleb James DeLisle 0e44b10aeb Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
Caleb James DeLisle c13bfe978a Switched cryptpad to use common/toolbar.js which is shared with cryptsheet
Caleb James DeLisle 50c10f818e Added cryptsheet to cryptpad suite!