web/cryptpad
Archived
5
0
Fork 0
Code Issues 1 Pull Requests 6 Actions Releases Wiki Activity

Commit Graph

  • 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
  • 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-08-23 12:15:01 +02:00
  • cbac5e417c Make loading screen come much earlier on pad2 Caleb James DeLisle 2017-08-23 12:14:51 +02:00
  • b6881349be Fix an issue with the notifications in secure pads yflory 2017-08-23 11:39:53 +02:00
  • ec64ac485d Fix 'not a function' error yflory 2017-08-23 11:06:55 +02:00
  • acfaaa7d56 jshint compliance Caleb James DeLisle 2017-08-23 11:04:44 +02:00
  • 2ad9fcee17 Manual merge of notify.js Caleb James DeLisle 2017-08-23 10:45:55 +02:00
  • 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-23 10:21:53 +02:00
  • 2dacd57e76 fix caching on favicon Caleb James DeLisle 2017-08-23 10:21:41 +02:00
  • 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-22 18:19:06 +02:00
  • c33b128bf4 Enable feedback in pad2 yflory 2017-08-22 18:18:58 +02:00
  • e81bb3fe08 Fix profile link in the userlist yflory 2017-08-22 18:18:48 +02:00
  • d6c33fdf4f Ghost icon to add a pad yflory 2017-08-22 17:33:48 +02:00
  • 89a13d4b21 work on contacts2 until feature parity is reached ansuz 2017-08-22 15:55:49 +02:00
  • 002eed0d6f make most of the messenger api async ansuz 2017-08-22 15:55:00 +02:00
  • d9f5e3638e Big caching improvements :D Caleb James DeLisle 2017-08-22 15:50:10 +02:00
  • 98daf10ed1 Ability to collapse the root directory in the drive yflory 2017-08-22 14:54:41 +02:00
  • b4864b96ac Add a recent pads category in the drive yflory 2017-08-22 14:28:17 +02:00
  • 1752124071 Fix Iframe height in Edge yflory 2017-08-22 11:50:52 +02:00
  • 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-21 18:38:16 +02:00
  • 4b70fc9f49 Use resources from the original origin in pad2 Caleb James DeLisle 2017-08-21 18:38:07 +02:00
  • 20a68ad71c Hide the template button if the pad2 is a template yflory 2017-08-21 18:31:15 +02:00
  • aa9e0d3cd3 Enable AppConfig in pad2 yflory 2017-08-21 18:30:51 +02:00
  • 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-21 18:22:08 +02:00
  • f40d2c0b20 Add templates to pad2 yflory 2017-08-21 18:21:53 +02:00
  • 8d020833af Add missing file yflory 2017-08-21 18:21:25 +02:00
  • bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-21 18:08:46 +02:00
  • b081603455 Update requirejs Caleb James DeLisle 2017-08-21 18:08:37 +02:00
  • 8d837d22ea Add history to pad2 yflory 2017-08-21 17:40:21 +02:00
  • b2e6df1f9d Add import & export in pad2 yflory 2017-08-21 15:34:21 +02:00
  • 1da11a1883 Disable edition in readonly mode in pad2 yflory 2017-08-21 15:30:48 +02:00
  • e2d39de143 Forget button in pad2 yflory 2017-08-21 15:20:38 +02:00
  • e4020ba8d4 Fix pad creation in pad2 yflory 2017-08-21 14:41:56 +02:00
  • 140c6f3776 Add limit warning in pad2 yflory 2017-08-21 12:24:33 +02:00
  • 30aef71603 Enable avatars in pad2 yflory 2017-08-21 12:01:38 +02:00
  • f88a6f63fe Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-21 11:08:38 +02:00
  • fb4808e1e1 Fix queries callback arguments yflory 2017-08-21 11:08:27 +02:00
  • 6dd1643738 Manual merge work done on loading page to pad2 Caleb James DeLisle 2017-08-21 10:53:40 +02:00
  • 8b702e0150 wip Caleb James DeLisle 2017-08-21 10:34:49 +02:00
  • e65b2f4e9f Add shareButton to pad2 yflory 2017-08-18 18:43:04 +02:00
  • beb45740d0 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-18 16:34:50 +02:00
  • 90f892de9c Useradmin menu, notifications and share button in pad2 yflory 2017-08-18 16:34:41 +02:00
  • 253ab68d8d Merge branch 'staging' into new-messaging ansuz 2017-08-18 15:31:06 +02:00
  • 8f03919fd7 Merge pull request #171 from CatalinScr/master ansuz 2017-08-18 15:26:24 +02:00
  • 3b1342247a Changed the social media links for Pierre CatalinScr 2017-08-18 16:23:09 +03:00
  • 49f7e0d63b Changed the Social Media links to Pierre CatalinScr 2017-08-18 16:01:50 +03:00
  • 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 +02:00
  • 0693a98890 create a thumbnail when uploading images from whiteboard ansuz 2017-08-18 12:52:39 +02:00
  • b17044ad98 add support for thumbnails in metadata ansuz 2017-08-18 12:47:04 +02:00
  • dd9b38066e Change display name in useradmin menu yflory 2017-08-18 11:07:42 +02:00
  • a96d447e8b Add notifications in pad2 yflory 2017-08-18 10:47:30 +02:00
  • a5cd915b06 Merge pull request #170 from pbondoer/caps ansuz 2017-08-18 10:10:52 +02:00
  • 5e22e1dc59 use CryptPad instead of Cryptpad in titles Pierre Bondoerffer 2017-08-17 20:47:39 +02:00
  • cf6d8c83b2 Fix title setter logic and separate it from UI Caleb James DeLisle 2017-08-17 19:58:48 +02:00
  • ec87f3f897 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-17 19:01:40 +02:00
  • 415399ef64 Changes to support title change in metadata Caleb James DeLisle 2017-08-17 19:01:33 +02:00
  • d1affebd14 Title in pad2 yflory 2017-08-17 19:01:03 +02:00
  • 604415b32c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 18:29:24 +02:00
  • fab3d67b75 Enable title in pad2 yflory 2017-08-17 18:28:05 +02:00
  • 909bda4302 This should fix laxy metadata Caleb James DeLisle 2017-08-17 18:26:58 +02:00
  • a4dbf39c4a fix pdf display problems in chrome ansuz 2017-08-17 18:11:46 +02:00
  • 2490ee253f Added setDisplayName RPC Caleb James DeLisle 2017-08-17 18:09:17 +02:00
  • 887a26b1a6 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 17:34:47 +02:00
  • 0b34ceb0eb Added RPC setPadTitleInDrive() Caleb James DeLisle 2017-08-17 17:34:08 +02:00
  • bed7d95bf3 use latest compiled cryptpad media-tag ansuz 2017-08-17 17:31:52 +02:00
  • 4e62f79594 stop referring to deleted file as background image ansuz 2017-08-17 17:31:18 +02:00
  • 3a5526e247 infer pdfjs document title from iframe url ansuz 2017-08-17 17:30:28 +02:00
  • 25466aa2f9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 17:26:27 +02:00
  • 1d237735ef Useradmin menu in pad2 yflory 2017-08-17 17:26:20 +02:00
  • 3b5af3ea74 sframe common changes Caleb James DeLisle 2017-08-17 16:56:18 +02:00
  • d1157c4d72 Add missing file yflory 2017-08-17 16:28:54 +02:00
  • d237c76f6c Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 16:25:31 +02:00
  • f5855a2870 Add account name in metadata manager yflory 2017-08-17 16:25:25 +02:00
  • 3c0197cbf4 Firefox fails to boot the iframe if there is no number on setInterval Caleb James DeLisle 2017-08-17 16:17:57 +02:00
  • d88704fb50 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 15:44:41 +02:00
  • a4850a7fcc Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 Caleb James DeLisle 2017-08-17 15:42:28 +02:00
  • fc5bdd3bed Add lazy metadata to fix parse errors in pad2 yflory 2017-08-17 15:42:26 +02:00
  • ad9f2ff223 Made pad2 server more generic and easy to implement Caleb James DeLisle 2017-08-17 15:41:04 +02:00
  • a125253cde lint compliance ansuz 2017-08-17 15:13:05 +02:00
  • 290763d6c5 don't complain about bad realtime state just because you disconnected ansuz 2017-08-17 15:07:34 +02:00
  • 226ef1fd00 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 yflory 2017-08-17 14:55:53 +02:00
  • fb512c8923 Toolbar in pad2 yflory 2017-08-17 14:55:44 +02:00
  • 3b20dcd435 add optional cache-busting to favicon ansuz 2017-08-17 14:34:22 +02:00
  • 48fe3ef841 add a tip about cryptdrive ansuz 2017-08-17 14:25:24 +02:00
  • 839c6df3bb remove invalid loading screen tips. create a new one ansuz 2017-08-17 14:16:37 +02:00
  • 52d344c3d1 Merge branch 'soon' ansuz 2017-08-17 12:53:04 +02:00
  • 95404992da Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-08-17 12:51:58 +02:00
  • ee874878dd clear tooltips when the userlist is redrawn ansuz 2017-08-17 12:50:40 +02:00
  • f207edfd28 handle errors when deriving keys. fix incorrect reference ansuz 2017-08-17 12:50:12 +02:00
  • e04c0b89a1 manual merge of staging Caleb James DeLisle 2017-08-17 12:14:19 +02:00