3145 Commits (bc5554f5f60dfd025f499905a6daf84a18882948)

Author SHA1 Message Date
yflory ab64bf9e59 Use less2 for the loading screen 7 years ago
Caleb James DeLisle 710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed 7 years ago
ansuz a332168926 fix some bugs in prompts, alerts, confirms 7 years ago
ansuz 0db33d48fc properly handle variable args in Cryptpad.alert 7 years ago
ansuz 8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 7 years ago
Caleb James DeLisle d46cc8226d Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs 7 years ago
ansuz dc86579d46 use an 8 character password for tests 7 years ago
ansuz e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 244e3ecba7 support forefront flag in alert config 7 years ago
Caleb James DeLisle 63cb5dfc1e Make less loader rewrite urls to use version parameter 7 years ago
Caleb James DeLisle d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle e3c0ec29f7 Hopefully chase out a race in sframe-channel 7 years ago
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 437f50fd4a Migrate the file to a sandboxed iframe 7 years ago
Caleb James DeLisle 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 7 years ago
yflory 5ac3e97dc8 Merge branch 'master' into staging 7 years ago
yflory 7d720c73a9 Merge branch 'soon' 7 years ago
yflory ddbda08c88 Fix an issue when cleaning the template category in the drive 7 years ago
ansuz 9d229b8868 lint compliance 7 years ago
yflory 5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 63700cb791 Fix an issue when cleaning the template category in the drive 7 years ago
ansuz a87ccdc37e remove redundant lines 7 years ago
ansuz da0e31fa54 guard against possible type errors 7 years ago
yflory 0f9da69185 Show if a pad has been renamed in the drive 7 years ago
ansuz 499b5ea2ba warn that a password is too short before doing anything else 7 years ago
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 7 years ago
Caleb James DeLisle a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 7 years ago
yflory 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 79094aa4bb Fix closing the title input when the title is not modified 7 years ago
ansuz 58c38dd77b focus on the current window when you pop an alert 7 years ago
ansuz b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 306fec2d0e improve messages for template picker confirm 7 years ago
ansuz 1943c83f69 clean up api for Cryptpad.confirm 7 years ago
Caleb James DeLisle 8d3ebdbaf7 I'm stupid 7 years ago
Caleb James DeLisle 041071e61c manual merge 7 years ago
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 7 years ago
yflory 9271b0c1a8 Try to fix half-codemirror bug 7 years ago
yflory 304a8df808 Remove unneeded migration and fix attributes migration 7 years ago
ansuz 5a1abc8986 let's try using actual js syntax 7 years ago
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 7 years ago
ansuz 59d25b4c1a use camel case, not snek case 7 years ago
ansuz 520b8967fd allow people with short passwords to log in 7 years ago
yflory 8ef27dca08 Lint 7 years ago
yflory 1aef844fc3 Fix title attribute for truncated titles in the drive 7 years ago
yflory 55fe882f64 Fix readonly mode in code 7 years ago
yflory bd422178c4 Hide the filepicker button in readonly mode 7 years ago
yflory 51f1be9f7a Improve the input style when renaming a folder in the drive tree 7 years ago
yflory 642511dc3b Disable exiting present mode when in embed mode 7 years ago
yflory 403b62f131 Fix ghost icon modal and improve UI on mobile 7 years ago
yflory 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) 7 years ago
yflory 5bf966633c Merge branch 'staging' into slide2 7 years ago
yflory 514bff7065 Add slide number in the title in slide2 7 years ago
ansuz 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz b5b9f931c7 don't use common-realtime 7 years ago
ansuz 32e8c8ef4b implement alertify without alertify 7 years ago
ansuz a302ee5d25 guard against undefined arguments 7 years ago
yflory c3a07e879c Merge branch 'staging' into slide2 7 years ago
yflory fc069dac48 Ask the user before loading the template picker 7 years ago
yflory 05793c220c Fix secure iframes on Edge 7 years ago
yflory 290d668ceb Fix race condition preventing slide to work on Edge 7 years ago
ansuz de5d925154 autoselect user href in settings 7 years ago
ansuz e950ce74cb focus on input when opening filepicker 7 years ago
ansuz 739903d511 don't check account usage if you aren't logged in 7 years ago
ansuz bbf7ed3827 refactor drive to use dialog.selectable()
fix class on alertify-like boxes
7 years ago
yflory f2aaaa9751 Move slide to secure iframe 7 years ago
ansuz 809b56625d refactor ui elements 7 years ago
ansuz bca9ba66cb enforce a configurable minimum password length when registering 7 years ago
ansuz 1958bca984 restore hashing screen in login and register 7 years ago
ansuz fab6264ce6 use loading screen from pages.js 7 years ago
ansuz e8298f165a only display first letter of name if user has no avatar 7 years ago
ansuz 85003f7a23 lint compliance 7 years ago
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 15e24ebe4f ui for hashtag picker 7 years ago
ansuz 1b97996ef8 implement util.once 7 years ago
yflory 0423a5f4e2 Clean secure iframe code 7 years ago
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 7 years ago
yflory 61b228db79 Fix double / when storing a file 7 years ago
yflory 8b2733e2da Fix typo 7 years ago
yflory 3ca9f41290 Get embed code for pad and code 7 years ago
yflory 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory e85b34f127 Add embed options in the secure pad hashes 7 years ago
ansuz 47ec959032 make sure contenteditable is not set in read only mode 7 years ago
ansuz 6a735b441f use paul's print styles 7 years ago
ansuz b3d5e04bb4 lint compliance 7 years ago
ansuz 3d2a2da74e add listAllTags api 7 years ago
yflory 31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 305feebbbe Fix scroll position when refreshing the drive tree 7 years ago
ansuz 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 1c50bb3f61 clear hung tooltips 7 years ago
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 7 years ago
yflory 729c013af7 Get mediatag embed code from the file app 7 years ago
yflory 904936209a Remove loading tips in the file picker 7 years ago
yflory 98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 204e45dfae Enable templates in pad 7 years ago
yflory 4108520d20 Add contacts in the new menu if the user is logged in 7 years ago
ansuz 38e1ed93e4 Merge branch 'code2' into staging 7 years ago
ansuz acaf45a0e0 drop thumbnails if metadata is too large 7 years ago
yflory 78b338c379 Merge branch 'code2' into staging 7 years ago
yflory db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 7 years ago
yflory d2787e3eff Make code2 the default code app 7 years ago
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 7 years ago
ansuz d42d988d36 make test more resilient 7 years ago
ansuz cd7b00d45b make pixels 100px 7 years ago
ansuz e8ac5ed87f add a test for thumbnails 7 years ago
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
7 years ago
ansuz b8e913c95a more thumbnail methods 7 years ago
ansuz ffbb21dd2c use cryptpad-september build of media-tag 7 years ago
yflory c0f14dea5e Store code2 and set the title at the first visit 7 years ago
yflory 86e23ac19f Use less2 in secure iframes 7 years ago
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app 7 years ago
ansuz 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz ae60b5845f implement search-by-tag for filesData 7 years ago
ansuz 72ef730f23 implement tag-related functions 7 years ago
ansuz 0302c06d0e send feedback if client does not support symbols 7 years ago
ansuz 52019dc763 make get and set pad attribute return only cloned data 7 years ago
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker 7 years ago
Caleb James DeLisle e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server 7 years ago
yflory 885282ddea Fix undefined friend 7 years ago
Caleb James DeLisle a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing 7 years ago
yflory b8971cdc23 Add previewMode settings to code2 7 years ago
yflory 0d008aaa2e Add indent settings to code2 7 years ago
yflory f54dc7505c Migrate indentation settings to a settings subobject 7 years ago
yflory 0893bcc0e5 Merge branch 'staging' into code2 7 years ago
yflory f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 0ce32464fd Fix flickering avatar in firefox 7 years ago
ansuz 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz ba0e935add stub localStorage, and handle errors that might come from touching localStorage 7 years ago
ansuz be8ea4102e keep trying to parse the hash until it works 7 years ago
yflory 4db4f66786 Remove an unnecessary fix for Safari 7 years ago
yflory a2ed266048 Move the code app in a secure iframe 7 years ago
Caleb James DeLisle 1044531806 Fix Safari iframe size issue 7 years ago
ansuz a34d1793e0 drop 'loading' text from loading screen 7 years ago
ansuz 595fa4c2e4 Merge branch 'soon' 7 years ago
ansuz 181a19a9a0 polyfill for array.fill 7 years ago
yflory 51fa6287c1 Enable notifications in secure pads 7 years ago
yflory 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 901917983b Fix an issue preventing pads to be stored in the drive 7 years ago
ansuz 40f062abda restore app usage report in new pad 7 years ago
ansuz 8fb7fef3f5 regular expressions are never falsey 7 years ago
ansuz 24eac9b4a6 test for flakey tests 7 years ago
ansuz 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 7 years ago
ansuz 288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle fe03e6ae83 bad code, lint 7 years ago
ansuz 430a6f7b77 lint compliance 7 years ago
Caleb James DeLisle 190dff1c9b Use the bounce app for opening a link with the right click 7 years ago
yflory dec870d2bd Fix selection in the drive search results 7 years ago
yflory 4bceef8952 Fix the upload status table missing in the drive 7 years ago
yflory 0b4e044540 Fix the plugin to open a link in a new tab in pad 7 years ago
yflory d9a4a32bf9 Fix avatar for anonymous users in secure pads 7 years ago
yflory 00fda0d7d7 Fix avatar in read-only mode (secure pads) 7 years ago
yflory 88cb4fd83c Enable friend requests from secure pads 7 years ago
yflory 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory e43c68aa48 Fix viewers number in secure iframe 7 years ago
yflory f89015d9ed Update the tab title to match the pad title in pad2 7 years ago
ansuz 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 51c065d13c Fix link to main in the new toolbar 7 years ago
yflory d9bf2abcd8 Fix old hashes not working anymore in pad 7 years ago
ansuz 536fe04790 emit notification when alert, confirm, or prompt are called 7 years ago
Caleb James DeLisle e4a356d873 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 056285a7b6 Move pad2 to pad and create bounce app 7 years ago
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 7 years ago
ansuz 5fbbaee2f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 6314487d98 handle unfriends in ui 7 years ago
ansuz 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback 7 years ago
ansuz 841e3af8da handle unfriends. clean up. better input validation 7 years ago
ansuz c66a0c55e0 ensure that function signatures are correct 7 years ago
ansuz 91f6e3e543 remove a lot of dead code 7 years ago
Caleb James DeLisle e62faf7c7b Edge fix, always use async iframe onLoad rather than invoking it manually 7 years ago
ansuz 54eefd3d94 replace contacts with contacts2 7 years ago
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 7 years ago
ansuz 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 22d754d514 handle user renames 7 years ago
Caleb James DeLisle 0a6f81850f Handle infinite-spinner errors and properly inform the user 7 years ago
ansuz a99eb9365e correctly set indentation preferences when changing languages 7 years ago
ansuz f58d4c941f clean up a bit 7 years ago
ansuz ea5f47f0f9 remove some TODOs and solve some wee bugs 7 years ago
ansuz b75a951a98 encode messages with 'author' field instead of 'channel' 7 years ago
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 7 years ago
ansuz 013b75ae67 implement history range requests 7 years ago
ansuz b71f1860db make uid function reusable 7 years ago
ansuz 443d8a8941 remove unnecessary files 7 years ago
Caleb James DeLisle 75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance) 7 years ago
Caleb James DeLisle dc283c2d74 Load 1, load 2... not load 1, load 3. 7 years ago
Caleb James DeLisle 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle cbac5e417c Make loading screen come much earlier on pad2 7 years ago
yflory b6881349be Fix an issue with the notifications in secure pads 7 years ago
yflory ec64ac485d Fix 'not a function' error 7 years ago
Caleb James DeLisle acfaaa7d56 jshint compliance 7 years ago
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 7 years ago
Caleb James DeLisle 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle 2dacd57e76 fix caching on favicon 7 years ago
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory c33b128bf4 Enable feedback in pad2 7 years ago
yflory e81bb3fe08 Fix profile link in the userlist 7 years ago
yflory d6c33fdf4f Ghost icon to add a pad 7 years ago
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 7 years ago
ansuz 002eed0d6f make most of the messenger api async 7 years ago
Caleb James DeLisle d9f5e3638e Big caching improvements :D 7 years ago
yflory 98daf10ed1 Ability to collapse the root directory in the drive 7 years ago
yflory b4864b96ac Add a recent pads category in the drive 7 years ago
Caleb James DeLisle 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle 4b70fc9f49 Use resources from the original origin in pad2 7 years ago
yflory 20a68ad71c Hide the template button if the pad2 is a template 7 years ago
yflory aa9e0d3cd3 Enable AppConfig in pad2 7 years ago
yflory 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory f40d2c0b20 Add templates to pad2 7 years ago
yflory 8d020833af Add missing file 7 years ago
Caleb James DeLisle bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle b081603455 Update requirejs 7 years ago
yflory 8d837d22ea Add history to pad2 7 years ago
yflory b2e6df1f9d Add import & export in pad2 7 years ago
yflory 1da11a1883 Disable edition in readonly mode in pad2 7 years ago
yflory e2d39de143 Forget button in pad2 7 years ago
yflory e4020ba8d4 Fix pad creation in pad2 7 years ago
yflory 140c6f3776 Add limit warning in pad2 7 years ago
yflory 30aef71603 Enable avatars in pad2 7 years ago
yflory f88a6f63fe Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory fb4808e1e1 Fix queries callback arguments 7 years ago
Caleb James DeLisle 6dd1643738 Manual merge work done on loading page to pad2 7 years ago
Caleb James DeLisle 8b702e0150 wip 7 years ago
yflory e65b2f4e9f Add shareButton to pad2 7 years ago
yflory beb45740d0 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory 90f892de9c Useradmin menu, notifications and share button in pad2 7 years ago
ansuz 253ab68d8d Merge branch 'staging' into new-messaging 7 years ago
Caleb James DeLisle 498c8229e9 Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad. 7 years ago
ansuz 0693a98890 create a thumbnail when uploading images from whiteboard 7 years ago
ansuz b17044ad98 add support for thumbnails in metadata 7 years ago
yflory dd9b38066e Change display name in useradmin menu 7 years ago
yflory a96d447e8b Add notifications in pad2 7 years ago
Pierre Bondoerffer 5e22e1dc59
use CryptPad instead of Cryptpad in titles 7 years ago
Caleb James DeLisle cf6d8c83b2 Fix title setter logic and separate it from UI 7 years ago
Caleb James DeLisle ec87f3f897 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle 415399ef64 Changes to support title change in metadata 7 years ago
yflory d1affebd14 Title in pad2 7 years ago
yflory 604415b32c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory fab3d67b75 Enable title in pad2 7 years ago
Caleb James DeLisle 909bda4302 This should fix laxy metadata 7 years ago
ansuz a4dbf39c4a fix pdf display problems in chrome 7 years ago
Caleb James DeLisle 2490ee253f Added setDisplayName RPC 7 years ago
yflory 887a26b1a6 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle 0b34ceb0eb Added RPC setPadTitleInDrive() 7 years ago
ansuz bed7d95bf3 use latest compiled cryptpad media-tag 7 years ago
ansuz 4e62f79594 stop referring to deleted file as background image 7 years ago
ansuz 3a5526e247 infer pdfjs document title from iframe url 7 years ago
yflory 25466aa2f9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory 1d237735ef Useradmin menu in pad2 7 years ago
Caleb James DeLisle 3b5af3ea74 sframe common changes 7 years ago
yflory d1157c4d72 Add missing file 7 years ago
yflory d237c76f6c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory f5855a2870 Add account name in metadata manager 7 years ago
Caleb James DeLisle 3c0197cbf4 Firefox fails to boot the iframe if there is no number on setInterval 7 years ago
yflory d88704fb50 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
Caleb James DeLisle a4850a7fcc Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory fc5bdd3bed Add lazy metadata to fix parse errors in pad2 7 years ago
Caleb James DeLisle ad9f2ff223 Made pad2 server more generic and easy to implement 7 years ago
ansuz a125253cde lint compliance 7 years ago
ansuz 290763d6c5 don't complain about bad realtime state just because you disconnected 7 years ago
yflory 226ef1fd00 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
yflory fb512c8923 Toolbar in pad2 7 years ago
ansuz 3b20dcd435 add optional cache-busting to favicon 7 years ago
ansuz 52d344c3d1 Merge branch 'soon' 7 years ago
ansuz ee874878dd clear tooltips when the userlist is redrawn 7 years ago
ansuz f207edfd28 handle errors when deriving keys. fix incorrect reference 7 years ago
Caleb James DeLisle e04c0b89a1 manual merge of staging 7 years ago
ansuz 5b7d1cccd7 fix display and logic for tab setting checkbox 7 years ago
Caleb James DeLisle 3315449114 Lets try this... 7 years ago
Caleb James DeLisle 4c949a61e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist. 7 years ago
yflory e7ef1e1c2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 7c49ca6e3f Fix initial text size in code 7 years ago
ansuz 2874ccb5dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 2a8abc2699 comment out splitter code 7 years ago
Caleb James DeLisle 725e19925c Yeah, that was silly... 7 years ago
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. 7 years ago
ansuz 130b330ede refactor messaging 7 years ago
Caleb James DeLisle 638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 7ca60e55a7 Lock the pad's inner-iframe down with CSP 7 years ago
ansuz 5e6e76dfc1 make regex case insensitive 7 years ago
ansuz 736288a85b lint compliance 7 years ago
ansuz 5037f444e9 update markdown sanitization strategy 7 years ago
Caleb James DeLisle 878a565f89 tiny little performance improvement in something that really doesn't need it 7 years ago
Caleb James DeLisle 007db0b080 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 7a698d092e When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read. 7 years ago
ansuz 66cacf08da allow users to write with tabs instead of spaces 7 years ago
ansuz 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Pierre Bondoerffer a5f9b49bfb
make poll box bigger so it show text in smaller windows 7 years ago
Pierre Bondoerffer 82fadde249
restyle info-box in drive 7 years ago
ansuz 958294f109 put code settings in their own tab 7 years ago
Pierre Bondoerffer c8d7675ede
remove z-index on splitter in code 7 years ago
Pierre Bondoerffer 17b986a6ca
fix toolbar drive link (oops) 7 years ago
ansuz ae0b2ca1a8 add label for code indentation 7 years ago
ansuz 284124a32d WIP 7 years ago
Caleb James DeLisle 4acd9957a9 Set the url if there is none 7 years ago
Caleb James DeLisle 33e73dd5e5 fixed one last fight 7 years ago
Caleb James DeLisle 9c0b0cc6a8 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 7 years ago
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz fbb880f277 implement customizable indentation widths 7 years ago
Caleb James DeLisle b3d349bf80 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 0dde1d7507 wip 7 years ago
Pierre Bondoerffer baf64114a6
point to homepage in drive 7 years ago
Pierre Bondoerffer 9dce40f3af
only add the splitter once 7 years ago
Pierre Bondoerffer 4026994310
make splitter work when scrolling 7 years ago
Caleb James DeLisle c304071492 wip 7 years ago
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 7 years ago
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 7 years ago
Pierre Bondoerffer c036bb26be
use proper bootstrap class 7 years ago
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Caleb James DeLisle 4b25ab80d6 wip 7 years ago
Pierre Bondoerffer b34e252eda
improve whiteboard styles 7 years ago
ansuz 844967a880 continued refactoring 7 years ago
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 7 years ago
Pierre Bondoerffer 5821d3e72f
remove useless title 7 years ago
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 7 years ago
Pierre Bondoerffer d47e26efd5
add margin in code 7 years ago
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 7 years ago
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 7 years ago
Pierre Bondoerffer 34ba673cd3
improve file upload UI 7 years ago
ansuz 34a5a32c44 lint compliance 7 years ago
ansuz cdf3cee9c8 split out message rendering into ui 7 years ago
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 7 years ago
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 7 years ago
Pierre Bondoerffer 2cc6c636db
Add some missing titles 7 years ago
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option 7 years ago
ansuz 8301bd44be Merge pull request #164 from pbondoer/staging
UI improvements
7 years ago
Pierre Bondoerffer 85e383d5c5
add invisible splitter 7 years ago
Pierre Bondoerffer 90075cd48e
media-tag to less file 7 years ago
Pierre Bondoerffer d15280c6ce
prevent pdfs from being huge 7 years ago
Pierre Bondoerffer c427f375dd
add bootstrap css to /code for image uploader 7 years ago
Pierre Bondoerffer f585ddccdf
fix image sizes in /slide/ 7 years ago
ansuz fc95f1b6a8 lint compliance 7 years ago
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle a612f02be2 Merge branch 'staging' into pad2 7 years ago
ansuz c63807fd2b implement channel.send 7 years ago
Caleb James DeLisle 35a55a15ed wip 7 years ago
ansuz d835005905 simplify in-memory message format 7 years ago
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier 7 years ago
ansuz 797cc2b105 handle messages which fail to decrypt 7 years ago
Caleb James DeLisle 65dfd99171 major wip 7 years ago
Pierre Bondoerffer c53e738054
improve file picker ui 7 years ago
Pierre Bondoerffer 798a3dc520
automatically fill in display name in poll 7 years ago
Pierre Bondoerffer 0588564bc9
overflow on poll div 7 years ago
Pierre Bondoerffer be29236af1
fix pdfjs styles 7 years ago
ansuz bad5160885 fix bad reference 7 years ago
ansuz 05aa5ed347 hide new feature until it is finished 7 years ago
ansuz 395f6e1b27 reset confirm text for alertify 7 years ago
ansuz dd6a057962 add 'msg' class for pierre 7 years ago
ansuz 9865359bb0 don't tell users about new versions 7 years ago
ansuz c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 0d1f19f5d4 Big manual merge 7 years ago
Pierre Bondoerffer f6d45d05f6
use logo in toolbar 7 years ago
ansuz 11c72499a0 don't add duplicate messages to the history 7 years ago
ansuz fb13e656b7 get new messages when reconnecting 7 years ago
ansuz 52854c5a8e ignore history range responses 7 years ago
ansuz e786117110 get new messages when reconnecting and WIP get more history 7 years ago
ansuz 2ce341fed6 disable input field when disconnected 7 years ago
ansuz aba4e34e7f reuse inline styles as a mixin 7 years ago
ansuz 195cb01d72 better styles for messaging input 7 years ago
ansuz 1fac0b9bc4 make todo text bold 7 years ago
ansuz 66d81429bd integrate file embed into code editor 7 years ago
ansuz dc7db074e8 open pad links when clicking in readOnly mode 7 years ago
ansuz 71d88b156d make empty profiles for users on first visit 7 years ago
ansuz 8b0831ac5d save images drawn with whiteboard to your CryptDrive 7 years ago
ansuz fe826133b3 make some markdown styles reusable 7 years ago
ansuz 35cf23ce2c clear tooltips when redrawing the userlist 7 years ago
ansuz 4c6f8d71e1 don't invoke spinner if it does not exist 7 years ago
ansuz 311f709dc4 lint compliance 7 years ago
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 542d0cd17f drop support for legacy pad list 7 years ago
Pierre Bondoerffer 93e007b52a
reduce png sizes 7 years ago
ansuz 1c238100c8 don't throw alerts in the middle of someone's presentation 7 years ago
ansuz 7cd42d5ff1 use provided clearTooltips function 7 years ago
ansuz 3fa010027c implement clearTooltips 7 years ago
ansuz a68a225d79 fix read-only synchronization bug 7 years ago
ansuz 9734a4db80 append new items to the top of the todo 8 years ago
ansuz 69eaccbdef don't create empty todo entries 8 years ago
ansuz e84edb2c2b disable problematic tooltips 8 years ago
ansuz 9c07793d0d remove tips on checkbox state change 8 years ago
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 8 years ago
yflory 8e83501c72 Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 8 years ago
yflory 459e0b3b16 CSS and bug fixes for todo 8 years ago
ansuz d4ffa7903f better popup logic 8 years ago
ansuz 0b81781f35 make the input bold 8 years ago
ansuz 2af96d74fc automatically focus on the create todo form 8 years ago
yflory 77d6da841f Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 8 years ago
yflory 3da76e3ae8 Update style for the todo app 8 years ago
ansuz 85366f2368 use new translations 8 years ago
ansuz d99d071716 WIP checkbox titles 8 years ago
ansuz e6031c2209 slightly better styles 8 years ago
ansuz 8cfd8d3270 add translations for todo 8 years ago
ansuz c390bdd518 resolve merge conflicts 8 years ago
yflory 0612a50ab4 Add fadein/fadeout when adding or removing a task 8 years ago
ansuz 082632048b fix styles for very wide todos 8 years ago
ansuz a15ff9ba2a hide dates in todo 8 years ago
ansuz f0581f2cf4 also style the whole box 8 years ago
ansuz d7d7f212bb add classes to style fake checkboxes based on checkstate 8 years ago
ansuz 304d37a334 use styled checkboxes 8 years ago
ansuz b5603c89f0 add checkboxes to todos 8 years ago
CatalinScr 796bf89491 Update of the front-page 8 years ago
ansuz 4f63921fc9 better width styling on list. lint compliance 8 years ago
yflory 35635c3e2f CSS fix for the todo app 8 years ago
ansuz 3efb9d21f5 pull in bootstrap. submit form on enter 8 years ago
ansuz 83f79a3883 slightly better styles 8 years ago
Nicolas Lemoine 180e643af9 Style of Todo App 8 years ago
Nicolas Lemoine 5083299e8a Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo 8 years ago
Nicolas Lemoine f67fb32bf1 Add, delete, display a task in Todo 8 years ago
ansuz 56514d7e17 add val api 8 years ago
Nicolas Lemoine ac718b6dfa Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo 8 years ago
Nicolas Lemoine a61faebb2b App Todo - Init and HTML 8 years ago
ansuz 522476a2a6 initialize data model and provide basic methods 8 years ago
yflory 4345fc0662 Todo app 8 years ago
Nicolas Lemoine e3b9c03fc0 TodoApp - Init 8 years ago
Nicolas Lemoine 658b00814b TodoApp - Style and translations 8 years ago
ansuz a9a65e4ca9 remove unused code 8 years ago
ansuz 4b53e02f6c oups 8 years ago
ansuz 2e3be27278 resolve merge 8 years ago
ansuz dcf5719eaf handle most of the boilerplate stuff 8 years ago
ansuz 0d43a84c2b move example into another folder 8 years ago
Nicolas Lemoine 5c07eac4de Change title and footer 8 years ago
ansuz f5454f232a pull in todomvc vanillajs example 8 years ago
ansuz ae693ff5a7 lint compliance 8 years ago
ansuz 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 55cb0734e2 make bad state timeout configurable 8 years ago
yflory 469f49fc0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a80b00a765 Move the file picker in common 8 years ago
ansuz d44f0696af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 2d0635a409 use custom version of tippy 8 years ago
yflory 09793e0d7d jshint 8 years ago
yflory 683769f30a Fix tooltips 8 years ago
yflory 9633025afe CSS for the removeHistory button in contacts 8 years ago
yflory 97f1bbedc5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b9bba76b4e Make the delay for tooltips configurable 8 years ago
ansuz dd98e2222a WIP erase chat history button 8 years ago
ansuz 128d5b2c6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz b22127f10c add history removal 8 years ago
yflory a5a73ce326 Fix print button in slide 8 years ago
yflory 3bd5f01e53 Fix slide ratio in preview mode 8 years ago
yflory 140964478e Enter + shift key to add a new line in chat 8 years ago
yflory 331b4dddea Clean debugging code 8 years ago
yflory e26e041a5b fix jshint errors 8 years ago
yflory c33d2a2db0 New tooltips 8 years ago
yflory 88813aee02 Show that only html can be imported in pads 8 years ago
yflory b56a782f01 Store the userlist state when it is closed using the icon 8 years ago
yflory 82c87144cb Remove the friend request button when the request is sent 8 years ago
yflory 5ce49af57b Make CryptDrive fast again 8 years ago
yflory 1dc98dcff1 CSS for the contacts input field 8 years ago
yflory e2d031c76a Add support for markdown syntax in contacts 8 years ago
yflory cba113a2b0 Lint 8 years ago
yflory 91ebbdfdb4 View contact status 8 years ago
yflory 221a3b4fed Fix duplicate leftside entries when disconnected in profile 8 years ago
yflory 22a28a8fd9 Fix undefined description in profile 8 years ago
ansuz 39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab 8 years ago
yflory 7540f12040 Fix profile creation button not centered 8 years ago
yflory f719b34e09 Add tab notification in contacts 8 years ago
yflory baf439648e Add the contacts app in the dropdown menu 8 years ago
yflory 36d792874a Fix initial text not removed in /contacts 8 years ago
yflory 3545a66320 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 743b87b70f Add initial text in /contacts 8 years ago
ansuz df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz eb4b5ca77c stub history removal. coming soon 8 years ago
yflory aa8181ab2b Contacts app translations 8 years ago
yflory 73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 009d01abde Fix friend removal and update user data 8 years ago
ansuz 0cd94e2ba8 add title to contacts app 8 years ago
ansuz f2320190b8 change friends url to /contacts/ 8 years ago
ansuz 756b561bbc lint compliance 8 years ago
ansuz 6306de5265 set avatar border-radius to 4px 8 years ago
ansuz c452f25414 stub invite app 8 years ago
ansuz 1aecdeb075 fresh media tag build 8 years ago
ansuz 7114bfaa52 lint compliance 8 years ago
ansuz 9ef45fe9f1 add background-color to names in chat 8 years ago
ansuz e2c17dbeb4 resolve conflicts 8 years ago
ansuz 0340b45f2c migrate profile to include edKey. don't propose connecting to users with whom you are already friends 8 years ago
yflory 557f13f796 Unfriend and update username - beta 8 years ago
ansuz 7be1e249e1 add fa-share-alt to pad initialText 8 years ago
ansuz 96d2ff67e1 user-plus as icon for add-friend 8 years ago
ansuz c3ba7cd792 fix race condition 8 years ago
ansuz d0d38aa2a3 feedback on first visit 8 years ago
ansuz 9527a5def7 avoid a CSP error. silence pdfjs warnings 8 years ago
ansuz 9707433944 comment out debugging info 8 years ago
ansuz 7a225af11e fix some minor slide navigation bugs 8 years ago
ansuz 575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz eda9908c3b prevent accessing attributes of null 8 years ago
ansuz eeb2ee2d17 add clear channel rpc 8 years ago
yflory 8fb5762eea Lint errors 8 years ago
ansuz 89af8e4472 fix funny off-by-one thing 8 years ago
yflory ac684a8dc7 Use the APP toolbar in profile 8 years ago
yflory 2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 8 years ago
ansuz f450a28d11 improve logic for guessing titles within code documents 8 years ago
ansuz 0483d15b8f lint compliance 8 years ago
ansuz c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz f4bca0f9c0 Modifications for latest media-tag
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
8 years ago
ansuz 5b3cca58bd modifications to handle latest media-tag 8 years ago
yflory 7f5c301734 Add display name in the settings useradmin menu 8 years ago
yflory fb21a650ce Lint errors 8 years ago
yflory d09f5b70c7 Fix slides CSS 8 years ago
yflory 159ccc2866 Fix mediatag flickering 8 years ago
yflory ce50dbf3ca Hide the 'templates' list header if the category is empty 8 years ago
yflory 42075e4b5f Make everything 16px and 32px 8 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 8 years ago
yflory 5d5f936682 Hide the upload table in code 8 years ago
yflory a0b14faf89 Fix the font in settings and drive 8 years ago
yflory e732284845 Lint 8 years ago
yflory 112c4c85e5 Left menu in drive 8 years ago
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 8 years ago
yflory 9f9e593e0f Lint 8 years ago
yflory 560671ae7d Make avatars circle 8 years ago
yflory 125018c8c3 New settings page 8 years ago
yflory c02fa39524 Make drive search bar blue 8 years ago
yflory 438e7e6cf9 Fix display name in useradmin (friends app) 8 years ago
yflory e6188bfb63 Fix useradmin dropdown position 8 years ago
yflory 97d8d86395 Fix avatar in static pages 8 years ago
yflory e8f3df5a46 Clean less 8 years ago
yflory 159d72f33b Merge branch 'msg' into staging 8 years ago
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory ff10c282d4 Avatar in the user admin button 8 years ago
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f0523a0153 Avatar in the user admin menu 8 years ago
ansuz e10de1219b feedback on view hash usage 8 years ago
ansuz 52eb8e307c feedback for language used 8 years ago
ansuz 086e5909dd Merge branch 'soon' into staging 8 years ago
ansuz 781974ec7c center 'Create a profile' button 8 years ago
yflory 1c531ccd47 Pin the chat channels 8 years ago
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 8 years ago
ansuz 29c6ed6e9b hide slide arrows when there are no more slides in that direction 8 years ago
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz eff27ff6c5 focus username button 8 years ago
ansuz c60a71e210 add connect button and view profile button 8 years ago
ansuz 94f8e4b8a3 use validateKeys when instantiating object 8 years ago
ansuz 22fbc7e5d8 implement getter for public keys 8 years ago
ansuz ecef970250 float connect button right because flex styles messed up the pencil icon 8 years ago
yflory df103c4074 Messaging app 8 years ago
ansuz f9a43d6570 select everything before file extensions in drive when renaming 8 years ago
ansuz 1c462d5c4a use random token for feedback instead of date 8 years ago
yflory 21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 5c7441f82c Display the friend list in the friend app 8 years ago
ansuz fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 4b23ef74d7 add support for curve message signing and curve validateKeys 8 years ago
yflory a5e8f6ae81 Add friend app and fix avatar size 8 years ago
yflory af31771e3a Share a channel id, not a hash 8 years ago
yflory 852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago