dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,133 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

1516 Commits

Author SHA1 Message Date
yflory 4049931924 Lint 2017-09-25 11:51:24 +02:00
yflory c364377d7c Use less2 in sframe drive 2017-09-25 11:48:42 +02:00
yflory 47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory 456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 68f7d4bc0a more conformant tagPrompt behaviour 2017-09-20 17:55:05 +02:00
ansuz f990200996 drop any notion of crypto from sframe-listmap 2017-09-19 18:21:33 +02:00
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:38:21 +02:00
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore 2017-09-19 15:38:06 +02:00
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz 4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +02:00
yflory 6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 11:04:59 +02:00
yflory 732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
ansuz d72146ba7f use setAttribute for assigning attributes in hyperscript 2017-09-19 10:27:19 +02:00
yflory a1e7bf701d Select the element after clicking 'show in folder' in the drive search 2017-09-18 15:24:25 +02:00
yflory 1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory 018f71df04 Add drop handlers for mediatags in ckeditor 2017-09-18 10:59:40 +02:00
ansuz 08e0ae424d log errors in less compilation 2017-09-14 18:13:03 +02:00
ansuz 5b45e92250 delete range requests after they have completed 2017-09-14 12:08:41 +02:00
ansuz 47ce645897 implement slice 2017-09-14 11:51:33 +02:00
ansuz 6ed4f2fc64 fix a thing 2017-09-14 11:27:10 +02:00
ansuz 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:23:51 +02:00
ansuz 513f8e73d4 refactor cryptpad.ready to use nthen 2017-09-14 11:23:37 +02:00
Caleb James DeLisle b643ccc232 typo 2017-09-14 10:54:16 +02:00
Caleb James DeLisle 652c916690 change the command in the documentation so that it will not change itself 2017-09-14 10:52:55 +02:00
Caleb James DeLisle 845f75f8a7 remove a 100ms dead spot from page load 2017-09-14 10:48:59 +02:00
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +02:00
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
 2017-09-14 10:23:05 +02:00
ansuz 4d688289cc lint-compliance 2017-09-13 18:19:15 +02:00
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
yflory 47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +02:00
ansuz f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 17:22:48 +02:00
ansuz fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:32:41 +02:00
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:20:26 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
Caleb James DeLisle 710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed 2017-09-13 16:04:01 +02:00
ansuz a332168926 fix some bugs in prompts, alerts, confirms 2017-09-13 15:52:31 +02:00
ansuz 0db33d48fc properly handle variable args in Cryptpad.alert 2017-09-13 14:52:58 +02:00
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:47:55 +02:00
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
Caleb James DeLisle d46cc8226d Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs 2017-09-13 14:46:41 +02:00
ansuz e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 12:33:05 +02:00
ansuz 244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
Caleb James DeLisle 63cb5dfc1e Make less loader rewrite urls to use version parameter 2017-09-13 12:04:24 +02:00
Caleb James DeLisle d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 11:00:09 +02:00
Caleb James DeLisle e3c0ec29f7 Hopefully chase out a race in sframe-channel 2017-09-13 11:00:00 +02:00
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory 437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 14:12:41 +02:00
Caleb James DeLisle 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 2017-09-12 14:12:35 +02:00
yflory 7d720c73a9 Merge branch 'soon' 2017-09-12 11:34:12 +02:00
yflory ddbda08c88 Fix an issue when cleaning the template category in the drive 2017-09-12 11:32:32 +02:00
ansuz 9d229b8868 lint compliance 2017-09-12 11:30:43 +02:00
ansuz a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +02:00
yflory 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:36:41 +02:00
yflory 79094aa4bb Fix closing the title input when the title is not modified 2017-09-11 16:36:24 +02:00
ansuz 58c38dd77b focus on the current window when you pop an alert 2017-09-11 16:34:00 +02:00
ansuz b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:26:21 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
ansuz 1943c83f69 clean up api for Cryptpad.confirm 2017-09-11 16:24:43 +02:00
Caleb James DeLisle 8d3ebdbaf7 I'm stupid 2017-09-11 15:53:27 +02:00
Caleb James DeLisle 041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory 304a8df808 Remove unneeded migration and fix attributes migration 2017-09-11 14:25:19 +02:00
ansuz 5a1abc8986 let's try using actual js syntax 2017-09-11 14:04:40 +02:00
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 2017-09-11 14:01:05 +02:00
ansuz 59d25b4c1a use camel case, not snek case 2017-09-11 14:00:27 +02:00
ansuz 520b8967fd allow people with short passwords to log in 2017-09-11 13:54:48 +02:00
yflory 5bf966633c Merge branch 'staging' into slide2 2017-09-08 18:21:38 +02:00
yflory 514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
ansuz 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-08 17:41:46 +02:00
ansuz b5b9f931c7 don't use common-realtime 2017-09-08 17:41:05 +02:00
ansuz 32e8c8ef4b implement alertify without alertify 2017-09-08 17:40:25 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory 05793c220c Fix secure iframes on Edge 2017-09-08 15:55:01 +02:00
yflory 290d668ceb Fix race condition preventing slide to work on Edge 2017-09-08 15:53:53 +02:00
ansuz 739903d511 don't check account usage if you aren't logged in 2017-09-08 14:00:49 +02:00
ansuz bbf7ed3827 refactor drive to use dialog.selectable() 
fix class on alertify-like boxes
 2017-09-08 12:24:20 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
ansuz 809b56625d refactor ui elements 2017-09-07 18:54:58 +02:00
ansuz bca9ba66cb enforce a configurable minimum password length when registering 2017-09-07 17:44:04 +02:00
ansuz fab6264ce6 use loading screen from pages.js 2017-09-07 16:41:11 +02:00
ansuz e8298f165a only display first letter of name if user has no avatar 2017-09-07 16:35:24 +02:00
ansuz 85003f7a23 lint compliance 2017-09-07 14:21:54 +02:00
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-07 12:45:18 +02:00
ansuz 15e24ebe4f ui for hashtag picker 2017-09-07 12:45:07 +02:00
ansuz 1b97996ef8 implement util.once 2017-09-07 12:26:05 +02:00
yflory 0423a5f4e2 Clean secure iframe code 2017-09-06 18:26:10 +02:00
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory 61b228db79 Fix double / when storing a file 2017-09-06 11:41:09 +02:00
yflory 3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 18:40:18 +02:00
yflory e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
ansuz b3d5e04bb4 lint compliance 2017-09-05 17:23:16 +02:00
ansuz 3d2a2da74e add listAllTags api 2017-09-05 16:52:22 +02:00
ansuz 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:37:02 +02:00
ansuz 1c50bb3f61 clear hung tooltips 2017-09-05 15:36:46 +02:00
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
yflory 729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
yflory 4108520d20 Add contacts in the new menu if the user is logged in 2017-09-05 11:43:16 +02:00
yflory 78b338c379 Merge branch 'code2' into staging 2017-09-05 11:38:17 +02:00
yflory db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:36:31 +02:00
yflory d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:27:11 +02:00
ansuz cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images. 
correct decryption logic
 2017-09-05 10:57:59 +02:00
ansuz b8e913c95a more thumbnail methods 2017-09-05 10:46:00 +02:00
ansuz ffbb21dd2c use cryptpad-september build of media-tag 2017-09-05 10:43:48 +02:00
yflory 86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
ansuz 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-31 18:12:21 +02:00
ansuz ae60b5845f implement search-by-tag for filesData 2017-08-31 18:12:13 +02:00
ansuz 72ef730f23 implement tag-related functions 2017-08-31 18:06:26 +02:00
ansuz 0302c06d0e send feedback if client does not support symbols 2017-08-31 18:04:20 +02:00
ansuz 52019dc763 make get and set pad attribute return only cloned data 2017-08-31 18:02:44 +02:00
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
Caleb James DeLisle e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server 2017-08-31 16:28:48 +02:00
yflory 885282ddea Fix undefined friend 2017-08-31 15:49:20 +02:00
Caleb James DeLisle a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing 2017-08-30 19:23:01 +02:00
yflory b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory 0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory f54dc7505c Migrate indentation settings to a settings subobject 2017-08-30 17:19:50 +02:00
yflory 0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 12:26:23 +02:00
yflory 0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
ansuz ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory 51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
yflory 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:03:05 +02:00
yflory 901917983b Fix an issue preventing pads to be stored in the drive 2017-08-29 11:02:56 +02:00
ansuz 8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz 24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz 430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
yflory d9a4a32bf9 Fix avatar for anonymous users in secure pads 2017-08-28 16:57:10 +02:00
yflory 00fda0d7d7 Fix avatar in read-only mode (secure pads) 2017-08-28 16:49:28 +02:00
yflory 88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 15:13:30 +02:00
yflory e43c68aa48 Fix viewers number in secure iframe 2017-08-28 15:13:16 +02:00
yflory f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
ansuz 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 14:49:01 +02:00
yflory 51c065d13c Fix link to main in the new toolbar 2017-08-28 14:18:33 +02:00
yflory d9bf2abcd8 Fix old hashes not working anymore in pad 2017-08-28 13:53:24 +02:00
ansuz 536fe04790 emit notification when alert, confirm, or prompt are called 2017-08-28 13:46:28 +02:00
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 12:22:38 +02:00
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +02:00
ansuz 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback 2017-08-28 11:47:01 +02:00
ansuz 841e3af8da handle unfriends. clean up. better input validation 2017-08-28 11:46:05 +02:00
ansuz c66a0c55e0 ensure that function signatures are correct 2017-08-28 11:40:31 +02:00
ansuz 91f6e3e543 remove a lot of dead code 2017-08-28 11:28:45 +02:00
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
ansuz 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-25 14:42:23 +02:00
ansuz 22d754d514 handle user renames 2017-08-25 14:42:05 +02:00
Caleb James DeLisle 0a6f81850f Handle infinite-spinner errors and properly inform the user 2017-08-25 14:24:43 +02:00
ansuz f58d4c941f clean up a bit 2017-08-24 17:19:57 +02:00
ansuz b75a951a98 encode messages with 'author' field instead of 'channel' 2017-08-24 17:14:03 +02:00
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 2017-08-24 13:53:42 +02:00
ansuz 013b75ae67 implement history range requests 2017-08-24 11:34:05 +02:00
ansuz b71f1860db make uid function reusable 2017-08-24 11:31:20 +02:00
Caleb James DeLisle 75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance) 2017-08-23 16:18:47 +02:00
Caleb James DeLisle 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-23 12:15:01 +02:00
Caleb James DeLisle cbac5e417c Make loading screen come much earlier on pad2 2017-08-23 12:14:51 +02:00
yflory b6881349be Fix an issue with the notifications in secure pads 2017-08-23 11:39:53 +02:00
yflory ec64ac485d Fix 'not a function' error 2017-08-23 11:06:55 +02:00
Caleb James DeLisle acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
Caleb James DeLisle 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-23 10:21:53 +02:00
Caleb James DeLisle 2dacd57e76 fix caching on favicon 2017-08-23 10:21:41 +02:00
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-22 18:19:06 +02:00
yflory c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
yflory e81bb3fe08 Fix profile link in the userlist 2017-08-22 18:18:48 +02:00
ansuz 002eed0d6f make most of the messenger api async 2017-08-22 15:55:00 +02:00
Caleb James DeLisle d9f5e3638e Big caching improvements :D 2017-08-22 15:50:10 +02:00
yflory b4864b96ac Add a recent pads category in the drive 2017-08-22 14:28:17 +02:00
Caleb James DeLisle 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:38:16 +02:00
Caleb James DeLisle 4b70fc9f49 Use resources from the original origin in pad2 2017-08-21 18:38:07 +02:00
yflory aa9e0d3cd3 Enable AppConfig in pad2 2017-08-21 18:30:51 +02:00
yflory f40d2c0b20 Add templates to pad2 2017-08-21 18:21:53 +02:00
yflory 8d020833af Add missing file 2017-08-21 18:21:25 +02:00
yflory 8d837d22ea Add history to pad2 2017-08-21 17:40:21 +02:00
yflory b2e6df1f9d Add import & export in pad2 2017-08-21 15:34:21 +02:00
yflory e2d39de143 Forget button in pad2 2017-08-21 15:20:38 +02:00
yflory e4020ba8d4 Fix pad creation in pad2 2017-08-21 14:41:56 +02:00
yflory 140c6f3776 Add limit warning in pad2 2017-08-21 12:24:33 +02:00
yflory 30aef71603 Enable avatars in pad2 2017-08-21 12:01:38 +02:00
yflory f88a6f63fe Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 11:08:38 +02:00
yflory fb4808e1e1 Fix queries callback arguments 2017-08-21 11:08:27 +02:00
Caleb James DeLisle 6dd1643738 Manual merge work done on loading page to pad2 2017-08-21 10:53:40 +02:00
Caleb James DeLisle 8b702e0150 wip 2017-08-21 10:34:49 +02:00