ansuz a3c093838c merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

..

assert

update test after merging api changes

2017-11-20 12:22:26 +01:00

auth

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

bounce

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

code

resolve merge conflicts

2017-11-23 16:56:49 +01:00

common

merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

contacts

resolve merge conflicts

2017-11-23 16:56:49 +01:00

debug

Fix scrollbar in the debug app

2017-11-21 17:42:50 +01:00

drive

merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

examples

Remove common-interface dependency from cryptpad-common

2017-11-13 12:00:26 +01:00

file

Remove util and hash from common

2017-11-13 16:32:40 +01:00

filepicker

merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

invite

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

login

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

pad

drop unreachable code

2017-11-23 16:57:01 +01:00

poll

use unified listmap

2017-11-24 13:40:21 +01:00

profile

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

register

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

settings

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

slide

Remove cryptpad-common dependency for some inner apps

2017-11-13 18:09:19 +01:00

todo

use unified listmap

2017-11-24 13:40:21 +01:00

user

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

whiteboard

resolve merge conflicts

2017-11-23 16:56:49 +01:00