Commit graph

1015 commits

Author SHA1 Message Date
ansuz
9527a5def7 avoid a CSP error. silence pdfjs warnings 2017-07-13 10:58:45 +02:00
ansuz
9707433944 comment out debugging info 2017-07-13 10:57:51 +02:00
ansuz
575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 18:56:12 +02:00
ansuz
eda9908c3b prevent accessing attributes of null 2017-07-12 18:56:04 +02:00
ansuz
eeb2ee2d17 add clear channel rpc 2017-07-12 18:55:29 +02:00
ansuz
89af8e4472 fix funny off-by-one thing 2017-07-12 18:49:33 +02:00
yflory
ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +02:00
yflory
2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 14:34:57 +02:00
yflory
b3e225cb3b Replace spinner by text and fix mobile UI 2017-07-12 14:33:28 +02:00
ansuz
f450a28d11 improve logic for guessing titles within code documents 2017-07-12 11:09:53 +02:00
ansuz
0483d15b8f lint compliance 2017-07-12 10:55:42 +02:00
ansuz
c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 10:46:15 +02:00
ansuz
f4bca0f9c0 Modifications for latest media-tag
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
2017-07-12 10:44:40 +02:00
ansuz
5b3cca58bd modifications to handle latest media-tag 2017-07-12 10:44:03 +02:00
yflory
7f5c301734 Add display name in the settings useradmin menu 2017-07-11 18:50:41 +02:00
yflory
fb21a650ce Lint errors 2017-07-11 17:40:13 +02:00
yflory
159ccc2866 Fix mediatag flickering 2017-07-11 17:39:08 +02:00
yflory
16d0527e92 Add a page title in drive, settings and file 2017-07-11 15:13:39 +02:00
yflory
a0b14faf89 Fix the font in settings and drive 2017-07-11 13:11:16 +02:00
yflory
8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 2017-07-11 11:56:06 +02:00
yflory
438e7e6cf9 Fix display name in useradmin (friends app) 2017-07-10 13:04:33 +02:00
yflory
e6188bfb63 Fix useradmin dropdown position 2017-07-10 12:38:54 +02:00
yflory
97d8d86395 Fix avatar in static pages 2017-07-10 12:03:44 +02:00
yflory
e8f3df5a46 Clean less 2017-07-10 11:57:04 +02:00
yflory
159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
yflory
8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:46:16 +02:00
yflory
ff10c282d4 Avatar in the user admin button 2017-07-10 11:46:06 +02:00
yflory
be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:16:52 +02:00
yflory
f0523a0153 Avatar in the user admin menu 2017-07-10 11:16:44 +02:00
ansuz
e10de1219b feedback on view hash usage 2017-07-10 11:13:56 +02:00
ansuz
52eb8e307c feedback for language used 2017-07-10 10:59:32 +02:00
yflory
1c531ccd47 Pin the chat channels 2017-07-10 10:39:57 +02:00
ansuz
4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz
c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-10 09:30:44 +02:00
ansuz
22fbc7e5d8 implement getter for public keys 2017-07-10 09:21:27 +02:00
yflory
df103c4074 Messaging app 2017-07-07 18:53:21 +02:00
ansuz
1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory
21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:39:06 +02:00
yflory
5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
ansuz
fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:35:21 +02:00
ansuz
4b23ef74d7 add support for curve message signing and curve validateKeys 2017-07-06 18:30:16 +02:00
yflory
a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory
af31771e3a Share a channel id, not a hash 2017-07-06 14:47:02 +02:00
yflory
852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory
26a83003b5 Create an owned channel 2017-07-06 14:27:13 +02:00
yflory
5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31:31 +02:00
ansuz
d3bbdc27c0 lint compliance 2017-07-06 10:33:31 +02:00
ansuz
bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 10:25:53 +02:00
ansuz
909e00bbc3 create a listmap object using public key crypto 2017-07-06 10:25:43 +02:00
yflory
96fde4e5ed Add missing file 2017-07-06 10:24:28 +02:00