Commit Graph

1478 Commits (6157c57a4be24e4fecc66839bd843837202d8966)

Author SHA1 Message Date
ansuz 69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
Caleb James DeLisle 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:03:31 +03:00
Caleb James DeLisle aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm> 2017-10-24 18:02:03 +03:00
ansuz bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 16:56:13 +02:00
ansuz dc90811090 only call onReady once in sframe-listmap 2017-10-24 16:56:08 +02:00
yflory bac10472f3 lint compliance 2017-10-24 14:32:47 +02:00
yflory 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 14:31:56 +02:00
yflory 18b5b20d27 Add thumbnails for PDFs 2017-10-24 14:31:42 +02:00
ansuz aee51f1317 lint compliance 2017-10-24 14:02:29 +02:00
ansuz 447b0a74ee handle errors for videos when uploading 2017-10-24 13:45:27 +02:00
yflory 30a69fae13 Add thumbnails for videos 2017-10-24 12:26:04 +02:00
yflory 21f8ae7570 Keep the correct ratio for image thumbnails 2017-10-24 11:45:07 +02:00
yflory 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:39:31 +02:00
yflory 13718d0263 Fix recent pads in chrome 2017-10-23 14:38:38 +02:00
ansuz 2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
Caleb James DeLisle 9b02b36724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:22:54 +03:00
Caleb James DeLisle d7e9498143 Fix and then disable the new OT 2017-10-23 14:22:33 +03:00
ansuz 288e141c1f add missing sframe method 2017-10-23 12:33:50 +02:00
yflory c1d05a00ba Improve media-tag export in pad to work with existing CSP 2017-10-23 10:55:40 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
yflory 6d080bcb45 Ability to export mediatag images in pad 2017-10-20 18:10:08 +02:00
yflory a0dd867f33 Fix pending state not removed after friend invite rejected 2017-10-20 18:09:09 +02:00
yflory c25be21138 Fix the upgrade button in the drive 2017-10-20 10:16:01 +02:00
Caleb James DeLisle cc6b2192e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-20 10:26:27 +03:00
yflory 515214aed1 Use present mode in embed code 2017-10-19 11:59:07 +02:00
yflory 201c974df6 Merge branch 'thumbnails' into staging 2017-10-19 11:43:43 +02:00
Caleb James DeLisle 81d0b3272d Fix multiple infinite-spinner errors piling up on top of eachother 2017-10-18 14:49:50 +03:00
Caleb James DeLisle 9e4c48f537 lint errors 2017-10-18 12:25:13 +03:00
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory 4116d08dd1 Display thumbnails in the drive and then file picker 2017-10-17 17:17:31 +02:00
yflory 6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon 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. 2017-10-14 00:31:31 +02:00
yflory 2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle 854c1e94a4 make infinite spinner error message go away if ChainPad settles after it has been popped 2017-10-13 13:39:49 +03:00
yflory 6926d42292 Autoload template picker to make it faster to appear when used 2017-10-12 18:18:01 +02:00
yflory 1c8e1a36e8 Add file type in the pad attributes for existing files 2017-10-12 17:43:49 +02:00
yflory b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 2017-10-12 17:33:22 +02:00
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory 62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02:00
Caleb James DeLisle c773b5d076 Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed 2017-10-12 15:42:09 +03:00
yflory 69dd3a60ab Hide template and fileupload buttons for anonymous users 2017-10-12 14:32:12 +02:00
yflory 8e1f15e88d Get title suggestion based on poll's description 2017-10-12 14:12:26 +02:00
yflory 95ad25973e Ability to delete a stronger pad from readonly mode 2017-10-12 11:41:53 +02:00
yflory b28c1537e8 Fix history in readonly mode 2017-10-12 10:59:23 +02:00
ansuz f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
Caleb James DeLisle c8928a0811 Switch the transform function and also stop calling textPatcher without the metadata 2017-10-09 17:07:26 +03:00
yflory 035150614d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:38:08 +02:00
yflory 484e216054 Fix hashtag button in the toolbar 2017-10-09 15:37:37 +02:00