Commit Graph

518 Commits (dfd50d103d8b2d8b9bcd7d8bff0f90ce1f75ad29)

Author SHA1 Message Date
Caleb James DeLisle a6b34491fc freeze the editor when reconnecting
Caleb James DeLisle c773b5d076 Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
Caleb James DeLisle 36aee2d174 lets try normalizing the dom before applying a patch
Caleb James DeLisle 9509d538e0 Cursor not being updated at the right times before applying a patch.
Caleb James DeLisle d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
Caleb James DeLisle 7230c780a1 Get rid of last usages of cryptpad-common in pad/inner
Caleb James DeLisle f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
Caleb James DeLisle 6dbc02e81a Merge branch 'staging' into framework
Caleb James DeLisle 1c791b5b51 Fix framework by removing some async and also fix media tags
yflory b4de31c827 Merge branch 'newdrive' into staging
Caleb James DeLisle 342b6012f7 manual merge of staging into framework
yflory 69014e5fde Fix mediatags in pad not cached
Caleb James DeLisle 77fe6a9bba small bug fixes
Caleb James DeLisle 368a6b2406 manual merge, still wip
Caleb James DeLisle 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/
yflory 456370b1aa Base for Drive in sandboxed iframe
yflory 95542bcdaf Lint
yflory 8a09e39f46 Enable tags in pads
yflory 72f0952835 Make sure we can't open a pad using the wrong app
yflory a78b597ebb lint errors
yflory 1131ef0172 Fix language selection in sandboxed iframes
yflory 018f71df04 Add drop handlers for mediatags in ckeditor
yflory c00d295466 Add missing translations
yflory 974658453c Mediatag integration in pads
Caleb James DeLisle 5f0383ae99 update version of sframe-boot because it was changed
Caleb James DeLisle 710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
Caleb James DeLisle 041071e61c manual merge
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad)
yflory 8ef27dca08 Lint
yflory 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden)
Paul Libbrecht 1ae7076790 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
yflory 0423a5f4e2 Clean secure iframe code
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings
ansuz 47ec959032 make sure contenteditable is not set in read only mode
ansuz 6a735b441f use paul's print styles
Paul Libbrecht e7de9229a8 Do not print toolbar and collaboration ().
paul
yflory 204e45dfae Enable templates in pad
yflory 86e23ac19f Use less2 in secure iframes
yflory 0d008aaa2e Add indent settings to code2
yflory 0893bcc0e5 Merge branch 'staging' into code2
ansuz 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz be8ea4102e keep trying to parse the hash until it works
yflory 4db4f66786 Remove an unnecessary fix for Safari
yflory a2ed266048 Move the code app in a secure iframe
Caleb James DeLisle 1044531806 Fix Safari iframe size issue
yflory 51fa6287c1 Enable notifications in secure pads
ansuz 40f062abda restore app usage report in new pad
Caleb James DeLisle fe03e6ae83 bad code, lint
Caleb James DeLisle 190dff1c9b Use the bounce app for opening a link with the right click
yflory 0b4e044540 Fix the plugin to open a link in a new tab in pad
yflory 88cb4fd83c Enable friend requests from secure pads
yflory f89015d9ed Update the tab title to match the pad title in pad2
Caleb James DeLisle 056285a7b6 Move pad2 to pad and create bounce app
Caleb James DeLisle b081603455 Update requirejs
Caleb James DeLisle 3315449114 Lets try this...
Caleb James DeLisle 6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
Caleb James DeLisle 725e19925c Yeah, that was silly...
Caleb James DeLisle b0b1ed037c Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
Caleb James DeLisle 638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 7ca60e55a7 Lock the pad's inner-iframe down with CSP
ansuz 5e6e76dfc1 make regex case insensitive
Pierre Bondoerffer 2cc6c636db
Add some missing titles
ansuz dc7db074e8 open pad links when clicking in readOnly mode
yflory 331b4dddea Clean debugging code
yflory c33d2a2db0 New tooltips
yflory 88813aee02 Show that only html can be imported in pads
ansuz 7be1e249e1 add fa-share-alt to pad initialText
yflory fa2d857d70 Fix css issues with Safari
yflory 5a3e9c785c Fix ckeditor toolbar
yflory ed0121d172 Lint errors
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens
ansuz 7a5c5ce0a3 load scripts asynchronously
ansuz 5e56ad912e remove the last bit of compiled css
ansuz cfc5907237 remove unnecessary style rules
ansuz 7de2683169 make all apps use clientside templates
ansuz e9bfaa9a60 compile less clientside. remove compiled css
yflory 0d4d104e08 Mobile support for the new toolbar
yflory a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 13288ee18b Update the userlist in code, slide and pad
ansuz 852c028822 don't allow editing if pad type is wrong
yflory 8d956c3de6 New toolbar
yflory b7a0547b77 New toolbar colors
yflory 59fb5bd8be One toolbar color per app
yflory 5a248db267 Merge branch 'staging' into newCk
yflory f13d23241c Upgrade CkEditor to version 4.7
ansuz d5c7eb49a4 send feedback on toolbar hide and CKE buttons
yflory 376b60c21c New toolbar temp
ansuz ec9a4dec5e Merge branch 'soon' into staging
ansuz 76c530037b enable donate button in all apps
ansuz 99a44f119f don't send referrer headers on pads which may link outward
ansuz 1240b864ef fix misconfigured history
yflory 716245f864 Make all the buttons look the same
yflory c00158d23a Move code to common-history
yflory ff16084719 Fix lint errors
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file
ansuz 78b11584f8 remove unused variables
yflory a165332c15 Don't store a pad in the drive if the limit has been reached
ansuz f7e96b4e8c resolve merge conflicts and jquery errors
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