Commit Graph

547 Commits (a857a0e3d4e2f6b14cd45c251111ec4bb9a6e475)

Author SHA1 Message Date
yflory 3d712d9008 Merge branch 'cursor' into staging
yflory 9d9845434e lint compliance
yflory 3b9e1ee10c Fix scrolling issue in pads when clicking on buttons
yflory c64feae7bf Merge branch 'staging' into cursor
yflory 2a6945cbe5 Fix export in the pad app with Chrome
yflory fe0d579d56 Cursor improvements in pad (Beta)
yflory 82c3c7f50b Improve the Typing Test in pad
yflory 1c5847dd01 Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor
yflory 9d6c9dcf5e Fix font issue with new paragraph in pads ()
yflory 2af2fccc11 Fix overflowing text in pad
yflory 35b0f878c7 Merge branch 'backupdrive' into staging
yflory 3e9e92dcac Implement full CryptDrive export
yflory 5a6c3597db Fix missing cursor in empty pads with Chrome and fix page mode
yflory f538a05044 Fix an issue with empty mediatag widgets in pads
yflory 8b05b1acaf Fix scrolling issue in pad when the userlist or the messenger was too big
yflory 2f3576f90e Fix image preview not resized correctly in the mediatag dialog
yflory ab07554d0b Fix initial size of the image preview in the mediatag dialog
yflory ee1027ceb9 Ability to import mediatags to the drive
yflory 264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored
yflory 90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app
yflory 5cd3cdc208 Don't handle drop events in the blockbase64 plugin
yflory 3f89dd9908 Disable pasting base64 images in ckeditor
ansuz 2259d1b6ac Merge branch 'soon' into staging
ansuz 8a113d742e
Merge pull request from xwiki-labs/issue-169-anchors-should-output-anchors
: First anchor test and restore of the CKEditor anchor function.
ansuz fb9cf2c81e lint compliance
Paul Libbrecht 0dc1500784 This should solve issue : The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
yflory bc57f8c274 Replace media-tag.js with the new one
yflory c7e08fedfb Password-protected files
Paul Libbrecht 372f1dfeb4 First anchor test and restore of the CKEditor anchor function.
yflory 10ce95087a Merge branch 'password' into staging
ansuz 123612b893 Merge branch 'de-translation-pl' into staging
yflory a66d33e5ca Improve export for pads with mediatags
yflory b26ae67df5 Fix issues with channel ID when using a password
yflory 7384568f77 Lint compliance
yflory 9d30e48a44 Fix mediatag redrawn on content update
yflory 2d08924462 Fix CkEditor issues
yflory cf549eeaef Clean the code
yflory 41afc28802 Fix conflicts, clean the code, add migration from old mediatags
yflory 6a4f25bc9f Test widget filters
yflory fd89811479 Clean mediatag plugin
yflory 5eab39ad75 Tets mediatag plugin using widgets
Paul Libbrecht 5747e1a492 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
yflory 4288f536f1 Use requireCSS to load FontAwesome
yflory 01dd6953b9 Fix the previous fix...
yflory c3f7b74baf Fix CkEditor's toolbar initial state
yflory 442f15df98 Add help text in all the apps + french translation
yflory 7a70d69d8e Hide editor toolbars by default when using a small screen
yflory b0dba481d8 Fix small UI issues and IE issues
yflory ee3b926e84 Get rid of ckeditor's reset_all class...
yflory 2c90cb5907 Move help button in drawer and fix drawer style
yflory d975bb9cc0 Fix focus after pad creation screen
yflory 60b2384885 Move initial state into a help block
yflory 80df45f257 Get text from ckeditor
yflory fb192a2c45 Add a configurable background color in the file app in view mode
yflory c460e2820e Fix a 1px offset for the userlist in Firefox/Windows
yflory f329d65bc8 Ability to reduce the width of ckeditor
yflory edc236e17b Disable edition in pad read-only mode
yflory c269929319 Fix creation page not displayed in pad and slide
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic
yflory 644f6e9985 Use the bounce app to open links from inner
ansuz 812df7de6f Merge branch 'merge-staging' into staging
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax
ansuz 2e00214783 drop unreachable code
ansuz ee6c2097f5 resolve merge conflicts
yflory cf26c4c286 Improve the toolbar UI for smaller screens
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad
ansuz e07bb0f7b3 roll back to old transform function, except in pad
yflory 8de9a596f1 Fix cursor in thumbnails
Evilham 5dcfbd07ab Merge branch 'theming-improvement' into staging
Evilham 4933aafbc8 Added default values to avoid breaking existing themes.
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming
yflory 6f020b67ca Add thumbnails to framework apps
yflory c1d05a00ba Improve media-tag export in pad to work with existing CSP
yflory 6d080bcb45 Ability to export mediatag images in pad
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.