Caleb James DeLisle 840cd91bcb manual merge		2017-11-09 15:38:32 +01:00
..
assert	add test for support of invite urls	2017-10-30 14:40:43 +01:00
auth	Delicious testing	2017-05-31 19:40:17 +02:00
bounce	Move pad2 to pad and create bounce app	2017-08-28 12:25:05 +02:00
code	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
common	manual merge	2017-11-09 15:38:32 +01:00
contacts	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
drive	manual merge	2017-11-09 15:38:32 +01:00
examples	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
file	Add file type in the pad attributes for existing files	2017-10-12 17:43:49 +02:00
filepicker	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
invite	Use less2 in secure iframes	2017-09-04 15:09:54 +02:00
login	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-09-13 16:20:26 +02:00
oldsettings	Migrate settings to use a sandboxed iframe	2017-11-09 14:23:40 +01:00
pad	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
poll	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00
profile	Migrate settings to use a sandboxed iframe	2017-11-09 14:23:40 +01:00
register	Enable redirection to the previous page after registration	2017-10-04 15:55:57 +02:00
settings	Migrate settings to use a sandboxed iframe	2017-11-09 14:23:40 +01:00
slide	Fix issue in diffMarked creating text nodes for each character	2017-10-31 18:19:30 +01:00
todo	lint compliance	2017-10-30 15:13:27 +01:00
user	Use less2 in secure iframes	2017-09-04 15:09:54 +02:00
whiteboard	Refactored out TextPatcher and JsonOT and replaced with new ChainPad	2017-11-09 15:36:49 +01:00