Commit Graph

  • ca8f05a16f bump package version ansuz 2017-08-29 11:53:50 +0200
  • 181a19a9a0 polyfill for array.fill ansuz 2017-08-29 11:49:10 +0200
  • 26dea043fb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-29 11:20:25 +0200
  • 51fa6287c1 Enable notifications in secure pads yflory 2017-08-29 11:20:02 +0200
  • 570ff75a6c update footer for latest version ansuz 2017-08-29 11:12:08 +0200
  • 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-29 11:03:05 +0200
  • 901917983b Fix an issue preventing pads to be stored in the drive yflory 2017-08-29 11:02:56 +0200
  • 40f062abda restore app usage report in new pad ansuz 2017-08-29 10:50:02 +0200
  • 8fb7fef3f5 regular expressions are never falsey ansuz 2017-08-29 10:37:19 +0200
  • 24eac9b4a6 test for flakey tests ansuz 2017-08-28 18:42:04 +0200
  • 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 +0200
  • 288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 17:52:01 +0200
  • fe03e6ae83 bad code, lint Caleb James DeLisle 2017-08-28 17:53:23 +0200
  • 430a6f7b77 lint compliance ansuz 2017-08-28 17:51:50 +0200
  • 190dff1c9b Use the bounce app for opening a link with the right click Caleb James DeLisle 2017-08-28 17:50:55 +0200
  • dec870d2bd Fix selection in the drive search results yflory 2017-08-28 17:43:26 +0200
  • 4bceef8952 Fix the upload status table missing in the drive yflory 2017-08-28 17:35:24 +0200
  • 0b4e044540 Fix the plugin to open a link in a new tab in pad yflory 2017-08-28 17:26:51 +0200
  • d9a4a32bf9 Fix avatar for anonymous users in secure pads yflory 2017-08-28 16:57:10 +0200
  • 00fda0d7d7 Fix avatar in read-only mode (secure pads) yflory 2017-08-28 16:49:28 +0200
  • 88cb4fd83c Enable friend requests from secure pads yflory 2017-08-28 16:21:05 +0200
  • 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-28 15:13:30 +0200
  • e43c68aa48 Fix viewers number in secure iframe yflory 2017-08-28 15:13:16 +0200
  • 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 14:49:01 +0200
  • f89015d9ed Update the tab title to match the pad title in pad2 yflory 2017-08-28 14:49:33 +0200
  • 51c065d13c Fix link to main in the new toolbar yflory 2017-08-28 14:18:33 +0200
  • d9bf2abcd8 Fix old hashes not working anymore in pad yflory 2017-08-28 13:53:24 +0200
  • 536fe04790 emit notification when alert, confirm, or prompt are called ansuz 2017-08-28 13:46:28 +0200
  • e4a356d873 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-28 12:25:12 +0200
  • 056285a7b6 Move pad2 to pad and create bounce app Caleb James DeLisle 2017-08-28 12:25:05 +0200
  • d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-28 12:22:38 +0200
  • 6c65e5ff72 Fix the ghost icon in the drive and add missing text yflory 2017-08-28 12:22:31 +0200
  • 5fbbaee2f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-28 11:48:02 +0200
  • 6314487d98 handle unfriends in ui ansuz 2017-08-28 11:47:54 +0200
  • 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback ansuz 2017-08-28 11:47:01 +0200
  • 841e3af8da handle unfriends. clean up. better input validation ansuz 2017-08-28 11:46:05 +0200
  • c66a0c55e0 ensure that function signatures are correct ansuz 2017-08-28 11:40:31 +0200
  • 91f6e3e543 remove a lot of dead code ansuz 2017-08-28 11:28:45 +0200
  • e62faf7c7b Edge fix, always use async iframe onLoad rather than invoking it manually Caleb James DeLisle 2017-08-28 11:22:57 +0200
  • 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 +0200
  • 818742dd56 Add frame-src for IE/Edge compatibility Caleb James DeLisle 2017-08-28 11:20:24 +0200
  • 54eefd3d94 replace contacts with contacts2 ansuz 2017-08-25 16:07:53 +0200
  • 57d0c6c973 Merge branch 'new-messaging' into staging ansuz 2017-08-25 14:42:34 +0200
  • 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-25 14:42:23 +0200
  • 22d754d514 handle user renames ansuz 2017-08-25 14:42:05 +0200
  • 0a6f81850f Handle infinite-spinner errors and properly inform the user Caleb James DeLisle 2017-08-25 14:24:43 +0200
  • a99eb9365e correctly set indentation preferences when changing languages ansuz 2017-08-24 17:31:04 +0200
  • f9cdbe66a0 add forgotten translation string ansuz 2017-08-24 17:20:59 +0200
  • f58d4c941f clean up a bit ansuz 2017-08-24 17:19:57 +0200
  • ea5f47f0f9 remove some TODOs and solve some wee bugs ansuz 2017-08-24 17:18:59 +0200
  • b75a951a98 encode messages with 'author' field instead of 'channel' ansuz 2017-08-24 17:14:03 +0200
  • cbf63b4c52 jshintignore pad2/wysiwygarea-plugin.js Caleb James DeLisle 2017-08-24 14:01:18 +0200
  • 35e7341f4d Merge branch 'ui-integration' into staging2 Caleb James DeLisle 2017-08-24 13:54:55 +0200
  • 7bbea28831 minor anti-xss changes... Caleb James DeLisle 2017-08-24 13:53:42 +0200
  • 78404ce8b7 add npm sub-commands ansuz 2017-08-24 11:34:46 +0200
  • 013b75ae67 implement history range requests ansuz 2017-08-24 11:33:33 +0200
  • b71f1860db make uid function reusable ansuz 2017-08-24 11:31:20 +0200
  • 443d8a8941 remove unnecessary files ansuz 2017-08-24 11:29:42 +0200
  • 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 +0200
  • dc283c2d74 Load 1, load 2... not load 1, load 3. Caleb James DeLisle 2017-08-23 15:49:51 +0200
  • 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-23 12:15:01 +0200
  • cbac5e417c Make loading screen come much earlier on pad2 Caleb James DeLisle 2017-08-23 12:14:51 +0200
  • b6881349be Fix an issue with the notifications in secure pads yflory 2017-08-23 11:39:53 +0200
  • ec64ac485d Fix 'not a function' error yflory 2017-08-23 11:06:55 +0200
  • acfaaa7d56 jshint compliance Caleb James DeLisle 2017-08-23 11:04:44 +0200
  • 2ad9fcee17 Manual merge of notify.js Caleb James DeLisle 2017-08-23 10:45:55 +0200
  • 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-23 10:21:53 +0200
  • 2dacd57e76 fix caching on favicon Caleb James DeLisle 2017-08-23 10:21:41 +0200
  • 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-22 18:19:06 +0200
  • c33b128bf4 Enable feedback in pad2 yflory 2017-08-22 18:18:58 +0200
  • e81bb3fe08 Fix profile link in the userlist yflory 2017-08-22 18:18:48 +0200
  • d6c33fdf4f Ghost icon to add a pad yflory 2017-08-22 17:33:48 +0200
  • 89a13d4b21 work on contacts2 until feature parity is reached ansuz 2017-08-22 15:55:49 +0200
  • 002eed0d6f make most of the messenger api async ansuz 2017-08-22 15:55:00 +0200
  • d9f5e3638e Big caching improvements :D Caleb James DeLisle 2017-08-22 15:50:10 +0200
  • 98daf10ed1 Ability to collapse the root directory in the drive yflory 2017-08-22 14:54:41 +0200
  • b4864b96ac Add a recent pads category in the drive yflory 2017-08-22 14:28:17 +0200
  • 1752124071 Fix Iframe height in Edge yflory 2017-08-22 11:50:52 +0200
  • 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-21 18:38:16 +0200
  • 4b70fc9f49 Use resources from the original origin in pad2 Caleb James DeLisle 2017-08-21 18:38:07 +0200
  • 20a68ad71c Hide the template button if the pad2 is a template yflory 2017-08-21 18:31:15 +0200
  • aa9e0d3cd3 Enable AppConfig in pad2 yflory 2017-08-21 18:30:51 +0200
  • 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-21 18:22:08 +0200
  • f40d2c0b20 Add templates to pad2 yflory 2017-08-21 18:21:53 +0200
  • 8d020833af Add missing file yflory 2017-08-21 18:21:25 +0200
  • bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-21 18:08:46 +0200
  • b081603455 Update requirejs Caleb James DeLisle 2017-08-21 18:08:37 +0200
  • 8d837d22ea Add history to pad2 yflory 2017-08-21 17:40:21 +0200
  • b2e6df1f9d Add import & export in pad2 yflory 2017-08-21 15:34:21 +0200
  • 1da11a1883 Disable edition in readonly mode in pad2 yflory 2017-08-21 15:30:48 +0200
  • e2d39de143 Forget button in pad2 yflory 2017-08-21 15:20:38 +0200
  • e4020ba8d4 Fix pad creation in pad2 yflory 2017-08-21 14:41:56 +0200
  • 140c6f3776 Add limit warning in pad2 yflory 2017-08-21 12:24:33 +0200
  • 30aef71603 Enable avatars in pad2 yflory 2017-08-21 12:01:38 +0200
  • f88a6f63fe Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-21 11:08:38 +0200
  • fb4808e1e1 Fix queries callback arguments yflory 2017-08-21 11:08:27 +0200
  • 6dd1643738 Manual merge work done on loading page to pad2 Caleb James DeLisle 2017-08-21 10:53:40 +0200
  • 8b702e0150 wip Caleb James DeLisle 2017-08-21 10:34:49 +0200
  • e65b2f4e9f Add shareButton to pad2 yflory 2017-08-18 18:43:04 +0200
  • beb45740d0 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-18 16:34:50 +0200