Commit graph

3115 commits

Author SHA1 Message Date
yflory
e2d031c76a Add support for markdown syntax in contacts 2017-07-19 10:29:59 +02:00
yflory
cba113a2b0 Lint 2017-07-18 15:52:46 +02:00
yflory
91ebbdfdb4 View contact status 2017-07-18 15:50:21 +02:00
yflory
221a3b4fed Fix duplicate leftside entries when disconnected in profile 2017-07-18 12:10:58 +02:00
yflory
22a28a8fd9 Fix undefined description in profile 2017-07-18 11:49:54 +02:00
yflory
26fa914982 Missing translation keys 2017-07-18 11:07:34 +02:00
ansuz
39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab 2017-07-18 10:57:37 +02:00
ansuz
b2de6ac28e Merge pull request #156 from pbondoer/spanish
Spanish update
2017-07-18 10:55:03 +02:00
yflory
7540f12040 Fix profile creation button not centered 2017-07-18 10:45:36 +02:00
yflory
f719b34e09 Add tab notification in contacts 2017-07-18 10:42:23 +02:00
Pierre Bondoerffer
a2c2e98060
Spanish update 2017-07-18 10:30:28 +02:00
yflory
6aab1c94b2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-18 10:24:00 +02:00
yflory
baf439648e Add the contacts app in the dropdown menu 2017-07-18 10:22:51 +02:00
yflory
36d792874a Fix initial text not removed in /contacts 2017-07-18 10:13:29 +02:00
ansuz
5716f76c91 fix typo in translations 2017-07-18 10:04:02 +02:00
yflory
3545a66320 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:51:40 +02:00
yflory
743b87b70f Add initial text in /contacts 2017-07-17 18:51:23 +02:00
ansuz
df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:40:27 +02:00
ansuz
eb4b5ca77c stub history removal. coming soon 2017-07-17 18:39:44 +02:00
yflory
aa8181ab2b Contacts app translations 2017-07-17 18:34:46 +02:00
yflory
73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:08:07 +02:00
yflory
009d01abde Fix friend removal and update user data 2017-07-17 18:07:58 +02:00
ansuz
0cd94e2ba8 add title to contacts app 2017-07-17 17:38:41 +02:00
ansuz
f2320190b8 change friends url to /contacts/ 2017-07-17 17:18:28 +02:00
ansuz
a28a59abf0 harden server further against bad channel ids 2017-07-17 16:34:47 +02:00
ansuz
06c971ec47 s/friend/contact/g 2017-07-17 15:52:13 +02:00
ansuz
756b561bbc lint compliance 2017-07-17 14:12:51 +02:00
ansuz
2e0aa185cd uppercase first letter of new translation keys 2017-07-17 14:12:05 +02:00
ansuz
6306de5265 set avatar border-radius to 4px 2017-07-17 13:43:51 +02:00
ansuz
c452f25414 stub invite app 2017-07-17 11:56:34 +02:00
ansuz
1aecdeb075 fresh media tag build 2017-07-17 11:08:39 +02:00
ansuz
33dcd2ae28 drop black border from avatars in userlist 2017-07-17 11:08:20 +02:00
ansuz
7114bfaa52 lint compliance 2017-07-13 21:09:29 +02:00
ansuz
9ef45fe9f1 add background-color to names in chat 2017-07-13 18:04:56 +02:00
ansuz
e2c17dbeb4 resolve conflicts 2017-07-13 17:52:00 +02:00
ansuz
0340b45f2c migrate profile to include edKey. don't propose connecting to users with whom you are already friends 2017-07-13 17:45:13 +02:00
yflory
557f13f796 Unfriend and update username - beta 2017-07-13 17:32:57 +02:00
ansuz
b295aaa6c7 harden clearChannel implementation 2017-07-13 17:28:07 +02:00
ansuz
7be1e249e1 add fa-share-alt to pad initialText 2017-07-13 15:48:03 +02:00
ansuz
96d2ff67e1 user-plus as icon for add-friend 2017-07-13 15:22:11 +02:00
ansuz
c3ba7cd792 fix race condition 2017-07-13 12:55:08 +02:00
ansuz
bf9c2b0b84 new messages 2017-07-13 12:29:49 +02:00
ansuz
980d555500 enable img-src blob: in /pad/ 2017-07-13 11:19:45 +02:00
ansuz
d0d38aa2a3 feedback on first visit 2017-07-13 11:03:56 +02:00
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
7a225af11e fix some minor slide navigation bugs 2017-07-13 10:57:27 +02:00
Caleb James DeLisle
f6abdc2b86 manual merge of staging 2017-07-13 10:30:42 +02:00
ansuz
a756faf818 lint compliance 2017-07-13 08:36:55 +02:00
ansuz
575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 18:56:12 +02:00