Commit Graph

1248 Commits (acaf45a0e06202d263865a58e5f923db4d923a66)

Author SHA1 Message Date
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:27:11 +02:00
ansuz cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
2017-09-05 10:57:59 +02:00
ansuz b8e913c95a more thumbnail methods 2017-09-05 10:46:00 +02:00
ansuz ffbb21dd2c use cryptpad-september build of media-tag 2017-09-05 10:43:48 +02:00
yflory 86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
yflory 885282ddea Fix undefined friend 2017-08-31 15:49:20 +02:00
yflory b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory 0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory f54dc7505c Migrate indentation settings to a settings subobject 2017-08-30 17:19:50 +02:00
yflory 0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 12:26:23 +02:00
yflory 0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
ansuz ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory 51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
yflory 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:03:05 +02:00
yflory 901917983b Fix an issue preventing pads to be stored in the drive 2017-08-29 11:02:56 +02:00
ansuz 8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz 24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz 430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
yflory d9a4a32bf9 Fix avatar for anonymous users in secure pads 2017-08-28 16:57:10 +02:00
yflory 00fda0d7d7 Fix avatar in read-only mode (secure pads) 2017-08-28 16:49:28 +02:00
yflory 88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 15:13:30 +02:00
yflory e43c68aa48 Fix viewers number in secure iframe 2017-08-28 15:13:16 +02:00
yflory f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
ansuz 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 14:49:01 +02:00
yflory 51c065d13c Fix link to main in the new toolbar 2017-08-28 14:18:33 +02:00
yflory d9bf2abcd8 Fix old hashes not working anymore in pad 2017-08-28 13:53:24 +02:00
ansuz 536fe04790 emit notification when alert, confirm, or prompt are called 2017-08-28 13:46:28 +02:00
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 12:22:38 +02:00
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +02:00
ansuz 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback 2017-08-28 11:47:01 +02:00
ansuz 841e3af8da handle unfriends. clean up. better input validation 2017-08-28 11:46:05 +02:00
ansuz c66a0c55e0 ensure that function signatures are correct 2017-08-28 11:40:31 +02:00
ansuz 91f6e3e543 remove a lot of dead code 2017-08-28 11:28:45 +02:00
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
ansuz 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-25 14:42:23 +02:00
ansuz 22d754d514 handle user renames 2017-08-25 14:42:05 +02:00
Caleb James DeLisle 0a6f81850f Handle infinite-spinner errors and properly inform the user 2017-08-25 14:24:43 +02:00
ansuz f58d4c941f clean up a bit 2017-08-24 17:19:57 +02:00
ansuz b75a951a98 encode messages with 'author' field instead of 'channel' 2017-08-24 17:14:03 +02:00
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 2017-08-24 13:53:42 +02:00