Commit Graph

  • 2aa6458039 Merge pull request #177 from xshadow/xshadow-cryptpad-readme-ansible ansuz 2017-09-05 10:11:34 +02:00
  • 05b11415c4 Updated Readme.md with hint for ansible setup xshadow 2017-09-04 22:00:11 +02:00
  • c0f14dea5e Store code2 and set the title at the first visit yflory 2017-09-04 17:09:45 +02:00
  • 86e23ac19f Use less2 in secure iframes yflory 2017-09-04 15:09:54 +02:00
  • f12f4bb925 Integrate filepicker secure iframe in the code2 app yflory 2017-09-01 15:17:14 +02:00
  • a10bab893f jshintignore media-tag ansuz 2017-08-31 18:45:18 +02:00
  • a164115e8c Add media-tag-nacl to cryptpad so it will be hosted on the server Caleb James DeLisle 2017-08-31 16:28:48 +02:00
  • 7b27b8635d fix padding on registration button ansuz 2017-08-31 18:58:08 +02:00
  • 6bb29e52e2 lint compliance ansuz 2017-08-31 18:45:18 +02:00
  • 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-31 18:12:21 +02:00
  • ae60b5845f implement search-by-tag for filesData ansuz 2017-08-31 18:12:13 +02:00
  • 72ef730f23 implement tag-related functions ansuz 2017-08-31 18:06:26 +02:00
  • 0302c06d0e send feedback if client does not support symbols ansuz 2017-08-31 18:04:20 +02:00
  • 52019dc763 make get and set pad attribute return only cloned data ansuz 2017-08-31 18:02:44 +02:00
  • 89b7b644f3 Enable drag & upload in code2 and prepare filepicker yflory 2017-08-31 16:32:26 +02:00
  • e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server Caleb James DeLisle 2017-08-31 16:28:48 +02:00
  • 885282ddea Fix undefined friend yflory 2017-08-31 15:49:20 +02:00
  • 0ceb4cbbcb Updated the contact page with the new design CatalinScr 2017-08-31 16:26:20 +03:00
  • 83be769bb3 Merge branch 'master' into staging updated with new version CatalinScr 2017-08-31 11:36:39 +03:00
  • 1bf77cb77e changed the icons CatalinScr 2017-08-31 11:27:02 +03:00
  • ee325c1813 Repaired the errors from lint CatalinScr 2017-08-31 10:20:10 +03:00
  • f95f3f4f24 Updated the contact page CatalinScr 2017-08-31 10:04:40 +03:00
  • a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing Caleb James DeLisle 2017-08-30 19:23:01 +02:00
  • b8971cdc23 Add previewMode settings to code2 yflory 2017-08-30 18:47:50 +02:00
  • 0d008aaa2e Add indent settings to code2 yflory 2017-08-30 17:57:10 +02:00
  • f54dc7505c Migrate indentation settings to a settings subobject yflory 2017-08-30 17:19:50 +02:00
  • 0893bcc0e5 Merge branch 'staging' into code2 yflory 2017-08-30 14:57:19 +02:00
  • f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-30 12:26:23 +02:00
  • 0ce32464fd Fix flickering avatar in firefox yflory 2017-08-30 12:26:11 +02:00
  • 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-30 11:31:59 +02:00
  • ba0e935add stub localStorage, and handle errors that might come from touching localStorage ansuz 2017-08-30 11:31:49 +02:00
  • be8ea4102e keep trying to parse the hash until it works ansuz 2017-08-30 11:26:51 +02:00
  • 4db4f66786 Remove an unnecessary fix for Safari yflory 2017-08-30 11:14:58 +02:00
  • d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-30 11:11:48 +02:00
  • 7498057c89 Fix Safari iframe size yflory 2017-08-30 11:11:43 +02:00
  • a2ed266048 Move the code app in a secure iframe yflory 2017-08-30 11:10:57 +02:00
  • 1044531806 Fix Safari iframe size issue Caleb James DeLisle 2017-08-30 11:04:52 +02:00
  • a34d1793e0 drop 'loading' text from loading screen ansuz 2017-08-29 18:15:40 +02:00
  • 2ef4ebc6ef two new tips for the loading screen ansuz 2017-08-29 17:56:34 +02:00
  • 595fa4c2e4 Merge branch 'soon' ansuz 2017-08-29 12:00:16 +02:00
  • ca8f05a16f bump package version ansuz 2017-08-29 11:53:50 +02:00
  • 181a19a9a0 polyfill for array.fill ansuz 2017-08-29 11:49:10 +02:00
  • 26dea043fb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-29 11:20:25 +02:00
  • 51fa6287c1 Enable notifications in secure pads yflory 2017-08-29 11:20:02 +02:00
  • 570ff75a6c update footer for latest version ansuz 2017-08-29 11:12:08 +02:00
  • 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-29 11:03:05 +02:00
  • 901917983b Fix an issue preventing pads to be stored in the drive yflory 2017-08-29 11:02:56 +02:00
  • 40f062abda restore app usage report in new pad ansuz 2017-08-29 10:50:02 +02:00
  • 8fb7fef3f5 regular expressions are never falsey ansuz 2017-08-29 10:37:19 +02:00
  • 24eac9b4a6 test for flakey tests ansuz 2017-08-28 18:42:04 +02:00
  • 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted ansuz 2017-08-28 18:32:43 +02:00
  • 288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 17:52:01 +02:00
  • fe03e6ae83 bad code, lint Caleb James DeLisle 2017-08-28 17:53:23 +02:00
  • 430a6f7b77 lint compliance ansuz 2017-08-28 17:51:50 +02:00
  • 190dff1c9b Use the bounce app for opening a link with the right click Caleb James DeLisle 2017-08-28 17:50:55 +02:00
  • dec870d2bd Fix selection in the drive search results yflory 2017-08-28 17:43:26 +02:00
  • 4bceef8952 Fix the upload status table missing in the drive yflory 2017-08-28 17:35:24 +02:00
  • 0b4e044540 Fix the plugin to open a link in a new tab in pad yflory 2017-08-28 17:26:51 +02:00
  • d9a4a32bf9 Fix avatar for anonymous users in secure pads yflory 2017-08-28 16:57:10 +02:00
  • 00fda0d7d7 Fix avatar in read-only mode (secure pads) yflory 2017-08-28 16:49:28 +02:00
  • 88cb4fd83c Enable friend requests from secure pads yflory 2017-08-28 16:21:05 +02:00
  • 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-28 15:13:30 +02:00
  • e43c68aa48 Fix viewers number in secure iframe yflory 2017-08-28 15:13:16 +02:00
  • 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 14:49:01 +02:00
  • f89015d9ed Update the tab title to match the pad title in pad2 yflory 2017-08-28 14:49:33 +02:00
  • 51c065d13c Fix link to main in the new toolbar yflory 2017-08-28 14:18:33 +02:00
  • d9bf2abcd8 Fix old hashes not working anymore in pad yflory 2017-08-28 13:53:24 +02:00
  • 536fe04790 emit notification when alert, confirm, or prompt are called ansuz 2017-08-28 13:46:28 +02:00
  • e4a356d873 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-28 12:25:12 +02:00
  • 056285a7b6 Move pad2 to pad and create bounce app Caleb James DeLisle 2017-08-28 12:25:05 +02:00
  • d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-28 12:22:38 +02:00
  • 6c65e5ff72 Fix the ghost icon in the drive and add missing text yflory 2017-08-28 12:22:31 +02:00
  • 5fbbaee2f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 11:48:02 +02:00
  • 6314487d98 handle unfriends in ui ansuz 2017-08-28 11:47:54 +02:00
  • 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback ansuz 2017-08-28 11:47:01 +02:00
  • 841e3af8da handle unfriends. clean up. better input validation ansuz 2017-08-28 11:46:05 +02:00
  • c66a0c55e0 ensure that function signatures are correct ansuz 2017-08-28 11:40:31 +02:00
  • 91f6e3e543 remove a lot of dead code ansuz 2017-08-28 11:28:45 +02:00
  • e62faf7c7b Edge fix, always use async iframe onLoad rather than invoking it manually Caleb James DeLisle 2017-08-28 11:22:57 +02:00
  • abec07b1f9 If config.js is missing, fallback to config.example.js which is in the git repo Caleb James DeLisle 2017-08-28 11:21:01 +02:00
  • 818742dd56 Add frame-src for IE/Edge compatibility Caleb James DeLisle 2017-08-28 11:20:24 +02:00
  • 54eefd3d94 replace contacts with contacts2 ansuz 2017-08-25 16:07:53 +02:00
  • 57d0c6c973 Merge branch 'new-messaging' into staging ansuz 2017-08-25 14:42:34 +02:00
  • 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-25 14:42:23 +02:00
  • 22d754d514 handle user renames ansuz 2017-08-25 14:42:05 +02:00
  • 0a6f81850f Handle infinite-spinner errors and properly inform the user Caleb James DeLisle 2017-08-25 14:24:43 +02:00
  • a99eb9365e correctly set indentation preferences when changing languages ansuz 2017-08-24 17:31:04 +02:00
  • f9cdbe66a0 add forgotten translation string ansuz 2017-08-24 17:20:59 +02:00
  • f58d4c941f clean up a bit ansuz 2017-08-24 17:19:57 +02:00
  • ea5f47f0f9 remove some TODOs and solve some wee bugs ansuz 2017-08-24 17:18:59 +02:00
  • b75a951a98 encode messages with 'author' field instead of 'channel' ansuz 2017-08-24 17:14:03 +02:00
  • cbf63b4c52 jshintignore pad2/wysiwygarea-plugin.js Caleb James DeLisle 2017-08-24 14:01:18 +02:00
  • 35e7341f4d Merge branch 'ui-integration' into staging2 Caleb James DeLisle 2017-08-24 13:54:55 +02:00
  • 7bbea28831 minor anti-xss changes... Caleb James DeLisle 2017-08-24 13:53:42 +02:00
  • 78404ce8b7 add npm sub-commands ansuz 2017-08-24 11:34:46 +02:00
  • 013b75ae67 implement history range requests ansuz 2017-08-24 11:33:33 +02:00
  • b71f1860db make uid function reusable ansuz 2017-08-24 11:31:20 +02:00
  • 443d8a8941 remove unnecessary files ansuz 2017-08-24 11:29:42 +02:00
  • 75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance) Caleb James DeLisle 2017-08-23 16:18:47 +02:00
  • dc283c2d74 Load 1, load 2... not load 1, load 3. Caleb James DeLisle 2017-08-23 15:49:51 +02:00