Commit graph

1229 commits

Author SHA1 Message Date
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
ansuz
013b75ae67 implement history range requests 2017-08-24 11:34:05 +02:00
ansuz
b71f1860db make uid function reusable 2017-08-24 11:31:20 +02:00
Caleb James DeLisle
75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance) 2017-08-23 16:18:47 +02:00
Caleb James DeLisle
5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-23 12:15:01 +02:00
Caleb James DeLisle
cbac5e417c Make loading screen come much earlier on pad2 2017-08-23 12:14:51 +02:00
yflory
b6881349be Fix an issue with the notifications in secure pads 2017-08-23 11:39:53 +02:00
yflory
ec64ac485d Fix 'not a function' error 2017-08-23 11:06:55 +02:00
Caleb James DeLisle
acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
Caleb James DeLisle
2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
Caleb James DeLisle
8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-23 10:21:53 +02:00
Caleb James DeLisle
2dacd57e76 fix caching on favicon 2017-08-23 10:21:41 +02:00
yflory
33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-22 18:19:06 +02:00
yflory
c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
yflory
e81bb3fe08 Fix profile link in the userlist 2017-08-22 18:18:48 +02:00
ansuz
002eed0d6f make most of the messenger api async 2017-08-22 15:55:00 +02:00
Caleb James DeLisle
d9f5e3638e Big caching improvements :D 2017-08-22 15:50:10 +02:00
yflory
b4864b96ac Add a recent pads category in the drive 2017-08-22 14:28:17 +02:00
Caleb James DeLisle
4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:38:16 +02:00
Caleb James DeLisle
4b70fc9f49 Use resources from the original origin in pad2 2017-08-21 18:38:07 +02:00