Caleb James DeLisle 041071e61c manual merge

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

..

assert

Add embed options in the secure pad hashes

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

auth

…

bounce

Move pad2 to pad and create bounce app

2017-08-28 12:25:05 +02:00

code

Try to fix half-codemirror bug

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

common

manual merge

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

contacts

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

drive

Lint

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

examples

…

file

Get mediatag embed code from the file app

2017-09-05 15:08:05 +02:00

filepicker

Merge branch 'staging' into slide2

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

invite

Use less2 in secure iframes

2017-09-04 15:09:54 +02:00

login

restore hashing screen in login and register

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

media

…

oldcode

Make code2 the default code app

2017-09-05 11:36:02 +02:00

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

enforce a configurable minimum password length when registering

2017-09-07 17:44:04 +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

Update requirejs

2017-08-21 18:08:37 +02:00

user

Use less2 in secure iframes

2017-09-04 15:09:54 +02:00

whiteboard

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

2017-08-25 14:42:23 +02:00