yflory 5ac3e97dc8 Merge branch 'master' into staging

2017-09-12 12:20:47 +02:00

..

assert

Add embed options in the secure pad hashes

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

auth

…

bounce

…

code

Duplicating code like a moron, this should hopefully get fixed later.

2017-09-11 17:52:34 +02:00

common

Merge branch 'soon'

2017-09-12 11:34:12 +02:00

contacts

…

drive

Show if a pad has been renamed in the drive

2017-09-12 11:17:52 +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

warn that a password is too short before doing anything else

2017-09-12 10:50:59 +02:00

settings

Merge branch 'staging' into slide2

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

slide

Duplicating code like a moron, this should hopefully get fixed later.

2017-09-11 17:52:34 +02:00

todo

…

user

Use less2 in secure iframes

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

whiteboard

…