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

2017-04-24 15:41:46 +02:00

..

assert

unbreak assert/translations

2017-04-24 14:32:56 +02:00

auth

Added an authentication page to allow getting the user pubkey

2017-04-20 10:15:07 +02:00

code

resolve merge conflicts and jquery errors

2017-04-24 13:43:18 +02:00

common

Don't remove a folder moved into unsorted or into itself

2017-04-24 15:38:03 +02:00

drive

make new text translateable

2017-04-18 18:31:58 +02:00

examples

Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter

2017-04-18 12:14:32 +02:00

login

feedback when logging in or registering

2017-04-24 14:15:17 +02:00

pad

resolve merge conflicts and jquery errors

2017-04-24 13:43:18 +02:00

poll

Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter

2017-04-18 12:14:32 +02:00

register

feedback when logging in or registering

2017-04-24 14:15:17 +02:00

settings

update footer for new version

2017-04-24 15:41:29 +02:00

slide

resolve merge conflicts and jquery errors

2017-04-24 13:43:18 +02:00

whiteboard

Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter

2017-04-18 12:14:32 +02:00