Commit Graph

  • 90f892de9c Useradmin menu, notifications and share button in pad2 yflory 2017-08-18 16:34:41 +0200
  • 253ab68d8d Merge branch 'staging' into new-messaging ansuz 2017-08-18 15:31:06 +0200
  • 8f03919fd7 Merge pull request #171 from CatalinScr/master ansuz 2017-08-18 15:26:24 +0200
  • 3b1342247a Changed the social media links for Pierre CatalinScr 2017-08-18 16:23:09 +0300
  • 49f7e0d63b Changed the Social Media links to Pierre CatalinScr 2017-08-18 16:01:50 +0300
  • 498c8229e9 Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad. Caleb James DeLisle 2017-08-18 14:12:30 +0200
  • 0693a98890 create a thumbnail when uploading images from whiteboard ansuz 2017-08-18 12:52:39 +0200
  • b17044ad98 add support for thumbnails in metadata ansuz 2017-08-18 12:47:04 +0200
  • dd9b38066e Change display name in useradmin menu yflory 2017-08-18 11:07:42 +0200
  • a96d447e8b Add notifications in pad2 yflory 2017-08-18 10:47:30 +0200
  • a5cd915b06 Merge pull request #170 from pbondoer/caps ansuz 2017-08-18 10:10:52 +0200
  • 5e22e1dc59
    use CryptPad instead of Cryptpad in titles Pierre Bondoerffer 2017-08-17 20:47:39 +0200
  • cf6d8c83b2 Fix title setter logic and separate it from UI Caleb James DeLisle 2017-08-17 19:58:48 +0200
  • ec87f3f897 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-17 19:01:40 +0200
  • 415399ef64 Changes to support title change in metadata Caleb James DeLisle 2017-08-17 19:01:33 +0200
  • d1affebd14 Title in pad2 yflory 2017-08-17 19:01:03 +0200
  • 604415b32c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 18:29:24 +0200
  • fab3d67b75 Enable title in pad2 yflory 2017-08-17 18:28:05 +0200
  • 909bda4302 This should fix laxy metadata Caleb James DeLisle 2017-08-17 18:26:58 +0200
  • a4dbf39c4a fix pdf display problems in chrome ansuz 2017-08-17 18:11:46 +0200
  • 2490ee253f Added setDisplayName RPC Caleb James DeLisle 2017-08-17 18:09:17 +0200
  • 887a26b1a6 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 17:34:47 +0200
  • 0b34ceb0eb Added RPC setPadTitleInDrive() Caleb James DeLisle 2017-08-17 17:34:08 +0200
  • bed7d95bf3 use latest compiled cryptpad media-tag ansuz 2017-08-17 17:31:52 +0200
  • 4e62f79594 stop referring to deleted file as background image ansuz 2017-08-17 17:31:18 +0200
  • 3a5526e247 infer pdfjs document title from iframe url ansuz 2017-08-17 17:30:28 +0200
  • 25466aa2f9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 17:26:27 +0200
  • 1d237735ef Useradmin menu in pad2 yflory 2017-08-17 17:26:20 +0200
  • 3b5af3ea74 sframe common changes Caleb James DeLisle 2017-08-17 16:56:18 +0200
  • d1157c4d72 Add missing file yflory 2017-08-17 16:28:54 +0200
  • d237c76f6c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 16:25:31 +0200
  • f5855a2870 Add account name in metadata manager yflory 2017-08-17 16:25:25 +0200
  • 3c0197cbf4 Firefox fails to boot the iframe if there is no number on setInterval Caleb James DeLisle 2017-08-17 16:17:57 +0200
  • d88704fb50 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 15:44:41 +0200
  • a4850a7fcc Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-17 15:42:28 +0200
  • fc5bdd3bed Add lazy metadata to fix parse errors in pad2 yflory 2017-08-17 15:42:26 +0200
  • ad9f2ff223 Made pad2 server more generic and easy to implement Caleb James DeLisle 2017-08-17 15:41:04 +0200
  • a125253cde lint compliance ansuz 2017-08-17 15:13:05 +0200
  • 290763d6c5 don't complain about bad realtime state just because you disconnected ansuz 2017-08-17 15:07:34 +0200
  • 226ef1fd00 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 14:55:53 +0200
  • fb512c8923 Toolbar in pad2 yflory 2017-08-17 14:55:44 +0200
  • 3b20dcd435 add optional cache-busting to favicon ansuz 2017-08-17 14:34:22 +0200
  • 48fe3ef841 add a tip about cryptdrive ansuz 2017-08-17 14:25:24 +0200
  • 839c6df3bb remove invalid loading screen tips. create a new one ansuz 2017-08-17 14:16:37 +0200
  • 52d344c3d1 Merge branch 'soon' ansuz 2017-08-17 12:53:04 +0200
  • 95404992da Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-17 12:51:58 +0200
  • ee874878dd clear tooltips when the userlist is redrawn ansuz 2017-08-17 12:50:40 +0200
  • f207edfd28 handle errors when deriving keys. fix incorrect reference ansuz 2017-08-17 12:50:12 +0200
  • e04c0b89a1 manual merge of staging Caleb James DeLisle 2017-08-17 12:14:19 +0200
  • 4881f8d030 Remove X-Frame-Options because it cannot work with a cross-domain iframe. Caleb James DeLisle 2017-08-17 12:12:40 +0200
  • 0a813b4fab Fix limit bar overflowing when over the limit yflory 2017-08-17 10:24:10 +0200
  • 5b7d1cccd7 fix display and logic for tab setting checkbox ansuz 2017-08-16 15:32:42 +0200
  • 744fb407ae Updated the what is page CatalinScr 2017-08-16 15:53:10 +0300
  • 2a666e0ba3 Merge branch 'staging' Caleb James DeLisle 2017-08-16 14:34:23 +0200
  • 3315449114 Lets try this... Caleb James DeLisle 2017-08-16 14:30:17 +0200
  • 1fd49d66f8 Merge branch 'soon' ansuz 2017-08-16 13:40:13 +0200
  • 4c949a61e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 12:40:34 +0200
  • 6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist. Caleb James DeLisle 2017-08-16 12:40:15 +0200
  • e7ef1e1c2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-16 12:35:13 +0200
  • 7c49ca6e3f Fix initial text size in code yflory 2017-08-16 12:34:56 +0200
  • 2874ccb5dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 12:15:20 +0200
  • 2a8abc2699 comment out splitter code ansuz 2017-08-16 12:15:08 +0200
  • e6cdf955d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 12:11:46 +0200
  • 725e19925c Yeah, that was silly... Caleb James DeLisle 2017-08-16 12:11:25 +0200
  • 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:34:54 +0200
  • f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 11:36:25 +0200
  • 3df20760c4 Yann does not have a twitter account. Caleb James DeLisle 2017-08-16 11:36:14 +0200
  • 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:34:35 +0200
  • df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-16 11:35:56 +0200
  • df0b7155f6 Add missing french translation yflory 2017-08-16 11:35:40 +0200
  • 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-16 11:31:09 +0200
  • 2b7dcbe77c remove bs class that caused poor alignment sometimes ansuz 2017-08-16 11:30:56 +0200
  • 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 11:29:59 +0200
  • d6125d864c Added Yann's bio Caleb James DeLisle 2017-08-16 11:29:50 +0200
  • a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-08-16 11:17:37 +0200
  • 9213aa7ee4 simplify example config ansuz 2017-08-16 11:02:03 +0200
  • e4d842ed08 Fix typos in the french translation yflory 2017-08-16 10:55:15 +0200
  • 7537caf8fe make footer translateable ansuz 2017-08-16 10:51:08 +0200
  • bd45aeaa03 bump package.json version ansuz 2017-08-16 10:31:47 +0200
  • d3a298d639 Merge branch 'ui-integration' into staging ansuz 2017-08-16 10:20:34 +0200
  • 8ee5e14a60 merge ui-integration ansuz 2017-08-16 10:20:05 +0200
  • 40287f973c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-16 10:19:50 +0200
  • b0b1ed037c Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable. Caleb James DeLisle 2017-08-16 10:19:24 +0200
  • 130b330ede refactor messaging ansuz 2017-08-16 10:04:50 +0200
  • fd3fd945c8 Updated the Log in Page CatalinScr 2017-08-16 07:56:18 +0300
  • 1f4d0a0a56 Repaired a bug CatalinScr 2017-08-16 06:56:08 +0300
  • dd48cf7c90 updated the register page CatalinScr 2017-08-15 23:47:36 +0300
  • 3196d4558f repaired the responsive error at about page CatalinScr 2017-08-15 06:50:13 +0300
  • 9a6bf302b4 ignore ckeditor hacks ansuz 2017-08-14 18:12:05 +0200
  • 638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-14 16:24:17 +0200
  • 723151254c remove a debug line before release which killed CSP Caleb James DeLisle 2017-08-14 16:23:56 +0200
  • 7ca60e55a7 Lock the pad's inner-iframe down with CSP Caleb James DeLisle 2017-08-14 16:23:38 +0200
  • 3960cd25f8 Updated the about page with the new design CatalinScr 2017-08-14 16:40:09 +0300
  • 5e6e76dfc1 make regex case insensitive ansuz 2017-08-14 14:41:23 +0200
  • 736288a85b lint compliance ansuz 2017-08-14 14:02:57 +0200
  • 5037f444e9 update markdown sanitization strategy ansuz 2017-08-14 13:12:43 +0200
  • 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad' Caleb James DeLisle 2017-08-11 17:54:15 +0200
  • 196ce3b3f7 Fix alertify style which made the registration popup look bad Caleb James DeLisle 2017-08-11 17:49:19 +0200
  • 878a565f89 tiny little performance improvement in something that really doesn't need it Caleb James DeLisle 2017-08-11 17:34:51 +0200
  • 007db0b080 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-11 17:28:42 +0200