web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • dc207393fd Separate UI elements from cryptpad-common yflory 2017-11-13 10:23:18 +01:00
  • 50da6b3b2e Needs to be handled in chainpad-listmap Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected" Caleb James DeLisle 2017-11-11 01:34:20 +01:00
  • eaa7b6e8e5 Do content checks on the drive so if it gets corrupted, the patch will be rejected Caleb James DeLisle 2017-11-11 01:26:54 +01:00
  • 354c63bd64 Clean old code yflory 2017-11-09 18:17:49 +01:00
  • ac66511f0a Merge branch 'staging' into new-diff Caleb James DeLisle 2017-11-09 17:44:45 +01:00
  • be848c1bec Fix broken readonly link in drive yflory 2017-11-09 17:27:50 +01:00
  • f931574dac lint compliance yflory 2017-11-09 17:23:13 +01:00
  • 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window Caleb James DeLisle 2017-11-09 17:07:04 +01:00
  • 840cd91bcb manual merge Caleb James DeLisle 2017-11-09 15:38:32 +01:00
  • 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad Caleb James DeLisle 2017-11-09 15:36:49 +01:00
  • cf5ccf04f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-09 14:23:54 +01:00
  • 101482b8cc Migrate settings to use a sandboxed iframe yflory 2017-11-09 14:23:40 +01:00
  • 7f8147b18b Merge branch 'soon' ansuz 2017-11-07 15:06:57 +01:00
  • 4bfd13d291 Merge branch 'staging' into soon ansuz 2017-11-07 15:06:51 +01:00
  • c1ba08cfc6 Make sure thumbnails are .png yflory 2017-11-07 15:04:45 +01:00
  • 0956905ca8 Wipe localForage on log out yflory 2017-11-07 14:56:50 +01:00
  • 6b9ffe8dd1 Make thumbnails more secure yflory 2017-11-07 14:51:53 +01:00
  • 454fc8498c remove old* apps ansuz 2017-11-07 13:50:07 +01:00
  • 12ae657422 Merge branch 'staging' into soon ansuz 2017-11-07 12:07:25 +01:00
  • 2ff66e1a7c Update french translation yflory 2017-11-06 17:39:41 +01:00
  • 2c9df23849 update english text for removing from trash in the drive ansuz 2017-11-06 17:37:29 +01:00
  • e07bb0f7b3 roll back to old transform function, except in pad ansuz 2017-11-06 17:18:10 +01:00
  • d10f752457 s/delete/move to trash ansuz 2017-11-06 17:07:37 +01:00
  • 0149347d1b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-06 15:49:46 +01:00
  • a592317e35 lint compliance yflory 2017-11-06 15:49:40 +01:00
  • fef97ed60e Fix an creating duplicates mediatags in markdown preview yflory 2017-11-06 15:47:18 +01:00
  • 402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-06 15:14:21 +01:00
  • c5f6491c37 bump footer and package.json to latest version ansuz 2017-11-06 15:14:02 +01:00
  • 9060464f37 Create thumbnails only when the tab is not focused yflory 2017-11-06 13:36:54 +01:00
  • a37e6c7979 lint compliance yflory 2017-11-03 18:39:06 +01:00
  • 2a3a5c4342 Ability to disable thumbnails yflory 2017-11-03 18:38:27 +01:00
  • 5dff9a32b6 Fix comments order in polls yflory 2017-11-03 18:38:04 +01:00
  • 1871749b6f Fix -1 viewer in the userlist when disconnected yflory 2017-11-03 15:14:23 +01:00
  • cf3024ef5b Ability to display an error in the toolbar state yflory 2017-11-03 14:26:38 +01:00
  • 8de9a596f1 Fix cursor in thumbnails yflory 2017-11-02 19:11:27 +01:00
  • fd7bb3aadb Make sure the infinite spinner modal is not displayed multiple times yflory 2017-11-02 17:47:19 +01:00
  • 3ebb5ca493 Fix issue in diffMarked creating text nodes for each character yflory 2017-10-31 18:19:30 +01:00
  • 5438970ab4 typo yflory 2017-10-31 11:30:13 +01:00
  • e0f7df80b3 Fix avatar upload and use less2 everywhere in profile yflory 2017-10-31 11:11:29 +01:00
  • 7f9b21405b Add missing files for profile yflory 2017-10-31 10:27:41 +01:00
  • e99836bae2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-30 18:49:43 +01:00
  • 4250688856 Migrate profile to use sframe yflory 2017-10-30 18:49:28 +01:00
  • 744809101c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-30 16:24:55 +01:00
  • 867df1db56 fix '+New' button in drive toolbar ansuz 2017-10-30 16:24:41 +01:00
  • 907e2cb517 lint compliance yflory 2017-10-30 15:13:27 +01:00
  • abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-30 15:12:29 +01:00
  • 68accaf653 Todo in sframe with less2 yflory 2017-10-30 15:12:15 +01:00
  • 11b8b380fd Merge branch 'staging' into evilham ansuz 2017-10-30 14:50:11 +01:00
  • 04f26ff886 Merge branch 'staging' of github.com:evilham/cryptpad into evilham ansuz 2017-10-30 14:41:21 +01:00
  • 0a14c715ad add test for support of invite urls ansuz 2017-10-30 14:40:43 +01:00
  • 5dcfbd07ab Merge branch 'theming-improvement' into staging Evilham 2017-10-27 18:32:08 +02:00
  • 4933aafbc8 Added default values to avoid breaking existing themes. Evilham 2017-10-27 18:31:52 +02:00
  • 4c0049ad55 don't log presence of other users as 'joins' when you have first joined ansuz 2017-10-27 14:20:31 +02:00
  • 325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-27 14:14:25 +02:00
  • 1cbf1aec92 prevent undefined access in non-sframe apps ansuz 2017-10-27 14:14:19 +02:00
  • ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-27 13:31:54 +02:00
  • 1245b4d244 Enable thumbnails in poll and whiteboard yflory 2017-10-27 13:31:41 +02:00
  • d644054e3f lint compliance ansuz 2017-10-27 11:13:21 +02:00
  • ed253e6c75 Merge branch 'staging' into evilham ansuz 2017-10-27 11:03:16 +02:00
  • df1a700cb2 disable thumbnail test. add test for flat dom ansuz 2017-10-27 11:01:22 +02:00
  • 02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-27 10:44:53 +02:00
  • 69890ebd8f prototype alternate datastructure for trees in listmap ansuz 2017-10-27 10:43:44 +02:00
  • 23c305f71f implement removeItem so localForage doesn't complain ansuz 2017-10-27 10:37:44 +02:00
  • 735f0a7e30 Merge branch 'theming-improvement' into staging Evilham 2017-10-26 20:44:56 +02:00
  • 83da9cf752 Moved colours to colortheme.less to enable theming Evilham 2017-10-26 20:29:14 +02:00
  • 8251247da2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-26 12:31:33 +02:00
  • 6f020b67ca Add thumbnails to framework apps yflory 2017-10-26 12:31:16 +02:00
  • 26c4bda4cd Fix file upload in code and slide yflory 2017-10-25 12:31:22 +02:00
  • 98c66ef8f6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-25 13:04:08 +02:00
  • bf817f20ee Fix file upload in code and slide yflory 2017-10-25 12:31:22 +02:00
  • f031af4e9d fix broken media-tags in contacts ansuz 2017-10-25 10:50:17 +02:00
  • f52a46c5aa add html2canvas dependency ansuz 2017-10-24 18:49:34 +02:00
  • 24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-24 18:50:19 +02:00
  • f4adbd980e Thumbnails for the code app yflory 2017-10-24 18:49:58 +02:00
  • ba97aa7ad2 allow file upload handler to create thumbnails for whiteboard ansuz 2017-10-24 18:09:38 +02:00
  • 6157c57a4b disable color palette when interface is not editable ansuz 2017-10-24 17:59:19 +02:00
  • 8359902f6a fix typo in poll ansuz 2017-10-24 17:42:08 +02:00
  • 69f9a7ebf3 make userlist change notifications configurable ansuz 2017-10-24 17:29:58 +02:00
  • 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-10-24 18:03:31 +03:00
  • aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm> Caleb James DeLisle 2017-10-24 18:02:03 +03:00
  • bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-24 16:56:13 +02:00
  • dc90811090 only call onReady once in sframe-listmap ansuz 2017-10-24 16:56:08 +02:00
  • bac10472f3 lint compliance yflory 2017-10-24 14:32:47 +02:00
  • 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-24 14:31:56 +02:00
  • 18b5b20d27 Add thumbnails for PDFs yflory 2017-10-24 14:31:42 +02:00
  • aee51f1317 lint compliance ansuz 2017-10-24 14:02:29 +02:00
  • 447b0a74ee handle errors for videos when uploading ansuz 2017-10-24 13:45:27 +02:00
  • 30a69fae13 Add thumbnails for videos yflory 2017-10-24 12:26:04 +02:00
  • 21f8ae7570 Keep the correct ratio for image thumbnails yflory 2017-10-24 11:45:07 +02:00
  • 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll yflory 2017-10-24 10:42:08 +02:00
  • 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-23 15:17:09 +02:00
  • a0bcb901d3 Add titles in poll when options or usernames are overflowing yflory 2017-10-23 15:16:51 +02:00
  • 74985fd0f2 Use text for the addUser button in polls yflory 2017-10-23 15:12:27 +02:00
  • 7d1892546b add missing french translation ansuz 2017-10-23 14:59:14 +02:00
  • 6db5a34323 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-23 14:53:42 +02:00
  • c17fc2efe7 improve option order in poll ansuz 2017-10-23 14:53:31 +02:00
  • 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-23 14:39:31 +02:00
  • 13718d0263 Fix recent pads in chrome yflory 2017-10-23 14:38:38 +02:00
  • 2e5fdf709a Merge branch 'soon' into staging ansuz 2017-10-23 14:29:01 +02:00
  • de8339fea7 hide alertify when you are in presentation mode ansuz 2017-10-23 14:25:25 +02:00