ansuz 5fbbaee2f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging		2017-08-28 11:48:02 +02:00
..
assert	Merge branch 'staging' into newDrive	2017-06-08 18:14:31 +02:00
auth	Delicious testing	2017-05-31 19:40:17 +02:00
code	Update requirejs	2017-08-21 18:08:37 +02:00
common	log error synchronously so we get a trace when pinPads has no callback	2017-08-28 11:47:01 +02:00
contacts	handle unfriends in ui	2017-08-28 11:47:54 +02:00
drive	jshint compliance	2017-08-23 11:04:44 +02:00
examples	Fix the text example	2017-05-17 15:48:09 +02:00
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	fix too-tall download button	2017-06-15 13:43:32 +02:00
pad	Update requirejs	2017-08-21 18:08:37 +02:00
pad2	Edge fix, always use async iframe onLoad rather than invoking it manually	2017-08-28 11:22:57 +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	Update requirejs	2017-08-21 18:08:37 +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