630 Commits

Author SHA1 Message Date
ansuz
311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz
542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
ansuz
3fa010027c implement clearTooltips 2017-07-31 12:29:41 +02:00
ansuz
ae693ff5a7 lint compliance 2017-07-23 09:01:12 +02:00
ansuz
6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-22 14:15:15 +02:00
ansuz
55cb0734e2 make bad state timeout configurable 2017-07-22 10:56:39 +02:00
yflory
a80b00a765 Move the file picker in common 2017-07-20 18:32:03 +02:00
yflory
b9bba76b4e Make the delay for tooltips configurable 2017-07-20 17:08:11 +02:00
yflory
c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory
82c87144cb Remove the friend request button when the request is sent 2017-07-19 14:14:34 +02:00
ansuz
c3ba7cd792 fix race condition 2017-07-13 12:55:08 +02:00
ansuz
d0d38aa2a3 feedback on first visit 2017-07-13 11:03:56 +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
yflory
ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +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
5b3cca58bd modifications to handle latest media-tag 2017-07-12 10:44:03 +02:00
yflory
a0b14faf89 Fix the font in settings and drive 2017-07-11 13:11:16 +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
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
5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
yflory
a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory
852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory
5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31: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
d293ba4d44 add support for invite hashes 2017-07-06 09:44:39 +02:00
yflory
37d5b0afb9 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-05 18:42:51 +02:00
yflory
95e2efab89 Add to friend list 2017-07-05 18:42:32 +02:00
ansuz
e353627204 log users out if they do not have curve keys. add curve keys to object on registration and login. 2017-07-05 17:19:28 +02:00
yflory
bf17ad3f1e Friend button in the userlist 2017-07-05 15:59:36 +02:00
yflory
8dc8aa27ab Lint 2017-07-05 12:27:40 +02:00
yflory
35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-05 12:27:08 +02:00
yflory
43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz
9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
ansuz
3fe0baa956 disable pin limit caching 2017-07-04 15:50:52 +02:00