2958 Commits (50da6b3b2e8407e86c7e221af68337b65ead1e86)

Author SHA1 Message Date
ansuz 0a99478d9f catch diffdom errors and plow through 7 years ago
ansuz 0f9e93e1de make tests pass again 7 years ago
ansuz 48c49e5a75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 19e58cec94 prevent typeError 7 years ago
yflory 66da349ee4 Sandboxed Poll app with less2 7 years ago
Caleb James DeLisle f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 7 years ago
Caleb James DeLisle 6dbc02e81a Merge branch 'staging' into framework 7 years ago
Caleb James DeLisle 1c791b5b51 Fix framework by removing some async and also fix media tags 7 years ago
Caleb James DeLisle 90d00c10b1 Make metadata-manager a bit more robust 7 years ago
yflory 9b2251005c Merge branch 'staging' into newpoll 7 years ago
yflory 8de1852ab9 Lint compliance 7 years ago
yflory 2c10f9b07b Merge branch 'staging' into newpoll 7 years ago
yflory e02a779c14 Use secure drive as default drive 7 years ago
yflory b4de31c827 Merge branch 'newdrive' into staging 7 years ago
yflory c1275b5671 Prepare secure poll 7 years ago
yflory 4c394e0031 Fix UI issue in poll 7 years ago
Caleb James DeLisle 342b6012f7 manual merge of staging into framework 7 years ago
Caleb James DeLisle cf6030ab8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle e62c5e1d07 Add some debugging lines to help synthesize error cases 7 years ago
ansuz 9571b3c018 persist whiteboard content across sessions 7 years ago
ansuz 748172585e update for modified id 7 years ago
ansuz 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 345bfc1cea Remove migration for pad attributes 7 years ago
ansuz 52be5501d6 remove invalid test 7 years ago
yflory 69014e5fde Fix mediatags in pad not cached 7 years ago
ansuz b3e066eaca show loading screen tips during loading screen 7 years ago
Caleb James DeLisle 77fe6a9bba small bug fixes 7 years ago
Caleb James DeLisle 1b01855dd2 Merge branch 'staging' into framework 7 years ago
Caleb James DeLisle 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once 7 years ago
Caleb James DeLisle 368a6b2406 manual merge, still wip 7 years ago
yflory cdeac00633 Merge branch 'staging' into newdrive 7 years ago
yflory a8eecee590 Fix access to undefined variable in drive 7 years ago
yflory 91e36171eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 138ad17e3e Fix 'import local pads' in settings creating duplicates 7 years ago
yflory 59ad96e491 Make sure the user is redirected to the drive at registration 7 years ago
yflory d2f1d0c0e9 Fix readme pad not added at registration in sframe drive 7 years ago
Caleb James DeLisle ae54cbca33 Refactor sframe-cpnf-inner to export chainpad 7 years ago
Caleb James DeLisle 44018ee7e1 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 7 years ago
Caleb James DeLisle b15527565c Allow passing arguments when firing events 7 years ago
Caleb James DeLisle 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ 7 years ago
Caleb James DeLisle d9845d3450 Refactor sframe-cpnf-inner to export chainpad 7 years ago
Caleb James DeLisle f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 7 years ago
Caleb James DeLisle 72f03b2a47 Allow passing arguments when firing events 7 years ago
yflory 1afbd4648d Fix old drive 7 years ago
yflory b871faffc9 Enable tags in code and slide 7 years ago
yflory 6aeb366767 Lint 7 years ago
yflory 0600ce59ec Display the 'spinner' when typing in sframe apps 7 years ago
yflory 1d7683503f Fix link origin in sframe upload table 7 years ago
yflory 92c808812a Fix missing style in toolbar/less2 7 years ago
yflory deba699d08 Remove old style for sframe drive 7 years ago
yflory 4049931924 Lint 7 years ago
yflory c364377d7c Use less2 in sframe drive 7 years ago
yflory 47fe7b1c53 Drive in sandboxed iframe 7 years ago
yflory dfdeb7b113 Fix style and race condition for history mode 7 years ago
yflory a810d7bd85 Fix style and race condition for history mode 7 years ago
yflory 456370b1aa Base for Drive in sandboxed iframe 7 years ago
ansuz 95302366d1 lint compliance 7 years ago
ansuz 68f7d4bc0a more conformant tagPrompt behaviour 7 years ago
ansuz db4c3e7e2c Merge branch 'master' into staging 7 years ago
ansuz b5b84f540e fix preview mode class 7 years ago
ansuz f990200996 drop any notion of crypto from sframe-listmap 7 years ago
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 95542bcdaf Lint 7 years ago
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore 7 years ago
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 8a09e39f46 Enable tags in pads 7 years ago
ansuz d2b27f3588 resolve merge conflicts 7 years ago
ansuz 4af01e6e9e make listmap consume cpNfInner 7 years ago
yflory 72f0952835 Make sure we can't open a pad using the wrong app 7 years ago
yflory 35a313d6ee Make palette realtime 7 years ago
yflory 6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 3023e8c855 Fix templates in whiteboard 7 years ago
yflory 732585ea7b Sandboxed iframe for the whiteboard app 7 years ago
ansuz 029a8e3023 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz d72146ba7f use setAttribute for assigning attributes in hyperscript 7 years ago
yflory a78b597ebb lint errors 7 years ago
yflory 8ce364a252 Add a button to empty the trash in the drive 7 years ago
yflory a1e7bf701d Select the element after clicking 'show in folder' in the drive search 7 years ago
ansuz f9d27d2783 WIP secure contacts 7 years ago
yflory 483160a96a Fix tab notifications in code and slides 7 years ago
yflory 1131ef0172 Fix language selection in sandboxed iframes 7 years ago
yflory 0a656ca8d6 Fix the splitter in code and add it back 7 years ago
yflory 018f71df04 Add drop handlers for mediatags in ckeditor 7 years ago
yflory c00d295466 Add missing translations 7 years ago
yflory a927f40f02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 974658453c Mediatag integration in pads 7 years ago
ansuz 08e0ae424d log errors in less compilation 7 years ago
ansuz 15db6b180c copy bug fixes from changes 7 years ago
ansuz 5b45e92250 delete range requests after they have completed 7 years ago
ansuz 4f6909fce3 set icon to 'faded' styles 7 years ago
ansuz 086d4bae32 clean up contacts initialization 7 years ago
yflory 96d0456f31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 1091e0b375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 47ce645897 implement slice 7 years ago
ansuz a8f7beb20b remove deprecated apps 7 years ago
ansuz 6ed4f2fc64 fix a thing 7 years ago
ansuz 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 513f8e73d4 refactor cryptpad.ready to use nthen 7 years ago
yflory c50c297490 Fix the size of the loading screen for the filepicker 7 years ago
Caleb James DeLisle b643ccc232 typo 7 years ago
Caleb James DeLisle 652c916690 change the command in the documentation so that it will not change itself 7 years ago
Caleb James DeLisle 5f0383ae99 update version of sframe-boot because it was changed 7 years ago
Caleb James DeLisle 845f75f8a7 remove a 100ms dead spot from page load 7 years ago
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 7 years ago
Caleb James DeLisle 8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
7 years ago
ansuz 4d688289cc lint-compliance 7 years ago
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 47cfa0cf45 Focus the editable content when opening a codemirror pad 7 years ago
ansuz f039fc7ff5 develop a system for avoiding z-index problems 7 years ago
yflory bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory fa64adbbe5 Hide visible elements while loading the slide app 7 years ago
ansuz fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
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