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

2017-08-30 12:26:23 +02:00

..

assert

…

auth

…

bounce

Move pad2 to pad and create bounce app

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

code

Merge branch 'soon'

2017-08-29 12:00:16 +02:00

common

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

2017-08-30 12:26:23 +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

Fix selection in the drive search results

2017-08-28 17:43:26 +02:00

examples

…

file

Manual merge of notify.js

2017-08-23 10:45:55 +02:00

invite

Manual merge of notify.js

2017-08-23 10:45:55 +02:00

login

Update requirejs

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

media

…

pad

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

2017-08-30 11:31:59 +02:00

poll

Update requirejs

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

profile

Manual merge of notify.js

2017-08-23 10:45:55 +02:00

register

Update requirejs

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

settings

Merge branch 'soon'

2017-08-29 12:00:16 +02:00

slide

Update requirejs

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

todo

Update requirejs

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

user

Update requirejs

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

whiteboard

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

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