infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Commit Graph

  • e99836bae2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-30 18:49:43 +0100
  • 4250688856 Migrate profile to use sframe yflory 2017-10-30 18:49:28 +0100
  • 744809101c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-30 16:24:55 +0100
  • 867df1db56 fix '+New' button in drive toolbar ansuz 2017-10-30 16:24:41 +0100
  • 907e2cb517 lint compliance yflory 2017-10-30 15:13:27 +0100
  • abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-30 15:12:29 +0100
  • 68accaf653 Todo in sframe with less2 yflory 2017-10-30 15:12:15 +0100
  • 11b8b380fd Merge branch 'staging' into evilham ansuz 2017-10-30 14:50:11 +0100
  • 04f26ff886 Merge branch 'staging' of github.com:evilham/cryptpad into evilham ansuz 2017-10-30 14:41:21 +0100
  • 0a14c715ad add test for support of invite urls ansuz 2017-10-30 14:40:43 +0100
  • 5dcfbd07ab Merge branch 'theming-improvement' into staging Evilham 2017-10-27 18:32:08 +0200
  • 4933aafbc8 Added default values to avoid breaking existing themes. Evilham 2017-10-27 18:31:52 +0200
  • 4c0049ad55 don't log presence of other users as 'joins' when you have first joined ansuz 2017-10-27 14:20:31 +0200
  • 325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-27 14:14:25 +0200
  • 1cbf1aec92 prevent undefined access in non-sframe apps ansuz 2017-10-27 14:14:19 +0200
  • ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-27 13:31:54 +0200
  • 1245b4d244 Enable thumbnails in poll and whiteboard yflory 2017-10-27 13:31:41 +0200
  • d644054e3f lint compliance ansuz 2017-10-27 11:13:21 +0200
  • ed253e6c75 Merge branch 'staging' into evilham ansuz 2017-10-27 11:03:16 +0200
  • df1a700cb2 disable thumbnail test. add test for flat dom ansuz 2017-10-27 11:01:22 +0200
  • 02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-27 10:44:53 +0200
  • 69890ebd8f prototype alternate datastructure for trees in listmap ansuz 2017-10-27 10:43:44 +0200
  • 23c305f71f implement removeItem so localForage doesn't complain ansuz 2017-10-27 10:37:44 +0200
  • 735f0a7e30 Merge branch 'theming-improvement' into staging Evilham 2017-10-26 20:44:56 +0200
  • 83da9cf752 Moved colours to colortheme.less to enable theming Evilham 2017-10-26 20:29:14 +0200
  • 8251247da2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-26 12:31:33 +0200
  • 6f020b67ca Add thumbnails to framework apps yflory 2017-10-26 12:31:16 +0200
  • 26c4bda4cd Fix file upload in code and slide yflory 2017-10-25 12:31:22 +0200
  • 98c66ef8f6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-25 13:04:08 +0200
  • bf817f20ee Fix file upload in code and slide yflory 2017-10-25 12:31:22 +0200
  • f031af4e9d fix broken media-tags in contacts ansuz 2017-10-25 10:50:17 +0200
  • f52a46c5aa add html2canvas dependency ansuz 2017-10-24 18:49:34 +0200
  • 24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-24 18:50:19 +0200
  • f4adbd980e Thumbnails for the code app yflory 2017-10-24 18:49:58 +0200
  • ba97aa7ad2 allow file upload handler to create thumbnails for whiteboard ansuz 2017-10-24 18:09:38 +0200
  • 6157c57a4b disable color palette when interface is not editable ansuz 2017-10-24 17:59:19 +0200
  • 8359902f6a fix typo in poll ansuz 2017-10-24 17:42:08 +0200
  • 69f9a7ebf3 make userlist change notifications configurable ansuz 2017-10-24 17:29:58 +0200
  • 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-10-24 18:03:31 +0300
  • 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 +0300
  • bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-24 16:56:13 +0200
  • dc90811090 only call onReady once in sframe-listmap ansuz 2017-10-24 16:56:08 +0200
  • bac10472f3 lint compliance yflory 2017-10-24 14:32:47 +0200
  • 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-24 14:31:56 +0200
  • 18b5b20d27 Add thumbnails for PDFs yflory 2017-10-24 14:31:42 +0200
  • aee51f1317 lint compliance ansuz 2017-10-24 14:02:29 +0200
  • 447b0a74ee handle errors for videos when uploading ansuz 2017-10-24 13:45:27 +0200
  • 30a69fae13 Add thumbnails for videos yflory 2017-10-24 12:26:04 +0200
  • 21f8ae7570 Keep the correct ratio for image thumbnails yflory 2017-10-24 11:45:07 +0200
  • 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll yflory 2017-10-24 10:42:08 +0200
  • 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-23 15:17:09 +0200
  • a0bcb901d3 Add titles in poll when options or usernames are overflowing yflory 2017-10-23 15:16:51 +0200
  • 74985fd0f2 Use text for the addUser button in polls yflory 2017-10-23 15:12:27 +0200
  • 7d1892546b add missing french translation ansuz 2017-10-23 14:59:14 +0200
  • 6db5a34323 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-23 14:53:42 +0200
  • c17fc2efe7 improve option order in poll ansuz 2017-10-23 14:53:31 +0200
  • 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-23 14:39:31 +0200
  • 13718d0263 Fix recent pads in chrome yflory 2017-10-23 14:38:38 +0200
  • 2e5fdf709a Merge branch 'soon' into staging ansuz 2017-10-23 14:29:01 +0200
  • de8339fea7 hide alertify when you are in presentation mode ansuz 2017-10-23 14:25:25 +0200
  • aaef30f489 bump cryptpad version ansuz 2017-10-23 14:05:49 +0200
  • 9b02b36724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-10-23 14:22:54 +0300
  • d7e9498143 Fix and then disable the new OT Caleb James DeLisle 2017-10-23 14:22:33 +0300
  • 05c66e64dd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-10-23 12:33:57 +0200
  • 288e141c1f add missing sframe method ansuz 2017-10-23 12:33:50 +0200
  • ce5d24a1d3 Remove error message about Tether yflory 2017-10-23 11:57:10 +0200
  • d571f408d8 Merge pull request #185 from MacLemon/reduce-image-asset-size ansuz 2017-10-23 11:46:56 +0200
  • 8590cf3f75 Merge pull request #189 from yannicka/patch-1 ansuz 2017-10-23 11:46:15 +0200
  • c1d05a00ba Improve media-tag export in pad to work with existing CSP yflory 2017-10-23 10:55:40 +0200
  • 3e4faf1be1 Add new state messages in the toolbar yflory 2017-10-20 18:12:47 +0200
  • 6d080bcb45 Ability to export mediatag images in pad yflory 2017-10-20 18:10:08 +0200
  • a0dd867f33 Fix pending state not removed after friend invite rejected yflory 2017-10-20 18:09:09 +0200
  • c25be21138 Fix the upgrade button in the drive yflory 2017-10-20 10:16:01 +0200
  • cc6b2192e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-10-20 10:26:27 +0300
  • 63dcfd6d18 Update French translation Yannick A 2017-10-19 21:02:03 +0200
  • a3c7aa67d8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-10-19 19:07:00 +0200
  • 094856a511 Fix renaming pad with multiple dots in the name in drive yflory 2017-10-19 18:30:55 +0200
  • bf832ba784 fix comment overflow ansuz 2017-10-19 17:30:40 +0200
  • 7bc2f81852 Fix pinned column not always stored in polls yflory 2017-10-19 16:01:56 +0200
  • 88e7f9a218 Add last access and creation times in the properties window in drive yflory 2017-10-19 15:05:55 +0200
  • 22e3baed4b Fix sort issues in drive yflory 2017-10-19 15:00:29 +0200
  • f43606f71d Present mode to display only the parsed markdown in code yflory 2017-10-19 14:39:38 +0200
  • 515214aed1 Use present mode in embed code yflory 2017-10-19 11:59:01 +0200
  • 201c974df6 Merge branch 'thumbnails' into staging yflory 2017-10-19 11:43:43 +0200
  • 7b8490ad20 Use less2 in contacts yflory 2017-10-19 09:58:28 +0200
  • dd63cd13d7 Fix profile page title yflory 2017-10-18 16:59:20 +0200
  • 81d0b3272d Fix multiple infinite-spinner errors piling up on top of eachother Caleb James DeLisle 2017-10-18 14:49:50 +0300
  • 9e4c48f537 lint errors Caleb James DeLisle 2017-10-18 12:25:13 +0300
  • a149152f11 Merge branch 'staging' into framework Caleb James DeLisle 2017-10-18 11:42:31 +0300
  • 4197b7b968 Fix missing icon in list mode for files with thumbnail yflory 2017-10-17 17:23:31 +0200
  • d941b1098a Remove selection in whiteboard when uploading to the drive yflory 2017-10-17 17:21:15 +0200
  • 4116d08dd1 Display thumbnails in the drive and then file picker yflory 2017-10-17 17:17:31 +0200
  • e553351b79 Put the add friend button in the userlist below the name yflory 2017-10-17 12:39:25 +0200
  • 6920129126 Embed images from the drive in whiteboard yflory 2017-10-17 12:17:54 +0200
  • 867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. MacLemon 2017-10-14 00:31:31 +0200
  • 2fd120100a Merge branch 'wb' into staging yflory 2017-10-13 16:58:59 +0200
  • 15337603bb Merge branch 'staging' into framework Caleb James DeLisle 2017-10-13 13:41:24 +0300
  • a6b34491fc freeze the editor when reconnecting Caleb James DeLisle 2017-10-13 13:40:51 +0300
  • 854c1e94a4 make infinite spinner error message go away if ChainPad settles after it has been popped Caleb James DeLisle 2017-10-13 13:39:49 +0300
  • a859ab081a Fix fouc in drive yflory 2017-10-11 17:15:56 +0200