yflory 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-09-11 16:36:41 +02:00

..

assert

Add embed options in the secure pad hashes

2017-09-05 18:38:51 +02:00

auth

…

bounce

…

code

Try to fix half-codemirror bug

2017-09-11 14:42:43 +02:00

common

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-09-11 16:36:41 +02:00

contacts

…

drive

Lint

2017-09-11 12:25:23 +02:00

examples

…

file

…

filepicker

Merge branch 'staging' into slide2

2017-09-08 18:21:38 +02:00

invite

…

login

restore hashing screen in login and register

2017-09-07 16:48:22 +02:00

media

…

oldcode

…

oldslide

Move slide to secure iframe

2017-09-07 18:56:58 +02:00

pad

manual merge

2017-09-11 15:52:14 +02:00

poll

Add setAttribute/getAttribute in secure iframes. Store attributes in settings

2017-09-06 16:05:20 +02:00

profile

Add setAttribute/getAttribute in secure iframes. Store attributes in settings

2017-09-06 16:05:20 +02:00

register

clean up api for Cryptpad.confirm

2017-09-11 16:24:43 +02:00

settings

Merge branch 'staging' into slide2

2017-09-08 18:21:38 +02:00

slide

Try to fix half-codemirror bug

2017-09-11 14:42:43 +02:00

todo

…

user

…

whiteboard

…