Caleb James DeLisle 7c8572c99d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-11-30 18:32:27 +01:00

..

assert

make tests pass again

2017-11-27 13:45:40 +01:00

auth

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

bounce

Add a markdown toolbar to help with the markdown syntax

2017-11-27 12:17:35 +01:00

code

Add the markdown toolbar to the slide and poll apps

2017-11-27 17:55:20 +01:00

common

Flow compliance and fix a few bugs in rpc.js

2017-11-30 18:32:20 +01:00

contacts

Use the bounce app to open links from inner

2017-11-27 14:44:44 +01:00

debug

Fix scrollbar in the debug app

2017-11-21 17:42:50 +01:00

drive

merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

examples

Refactored out TextPatcher and JsonOT and replaced with new ChainPad

2017-11-09 15:36:49 +01:00

file

Remove util and hash from common

2017-11-13 16:32:40 +01:00

filepicker

merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00

invite

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

login

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

pad

Use the bounce app to open links from inner

2017-11-27 14:44:44 +01:00

poll

Add the markdown toolbar to the slide and poll apps

2017-11-27 17:55:20 +01:00

profile

Add the markdown toolbar in profile

2017-11-27 18:10:37 +01:00

register

fix broken register/login process

2017-11-24 15:12:00 +01:00

settings

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

slide

fix codemirror overflow css

2017-11-30 17:24:43 +01:00

todo

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

2017-11-27 12:16:47 +01:00

user

Clean cryptpad-common

2017-11-23 12:28:49 +01:00

whiteboard

resolve merge conflicts

2017-11-23 16:56:49 +01:00