narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity
5173 commits 6 branches 4 tags 61 MiB
Commit graph

3997 commits

Author SHA1 Message Date
Daniel Gultsch 18a8a6e5ac make session completion work with untrusted devices as well 2018-05-09 09:24:31 +02:00
Daniel Gultsch ffe610f961 max out emoji enlargment at 42 emojis 2018-05-09 09:07:26 +02:00
Daniel Gultsch 13d6885883 split heighlights by special characters. fixes #3007 2018-05-07 11:14:33 +02:00
Daniel Gultsch 78b56bb904 don’t scall images to a 0 width or height 2018-05-07 11:13:46 +02:00
Daniel Gultsch 7ca719b8be apply styling helper to conversation overview 2018-05-06 11:22:20 +02:00
ChaosKid42 1fcd69ce40 ban can be disabled in Config.java (#3016) 2018-05-05 19:40:43 +02:00
Daniel Gultsch 8cd222b046 XmppUri code cleanup 2018-05-04 22:07:00 +02:00
Daniel Gultsch f9e26d7887 pulled translations from transifex 2018-05-04 12:21:14 +02:00
Daniel Gultsch 77fc8d2d9e encode and decode % and # in invite links 2018-05-04 12:18:31 +02:00
Daniel Gultsch 9b73029267 copy jabber id and web url via context menu 2018-05-04 11:39:03 +02:00
Daniel Gultsch 96224c0fc6 filter sequences of more than 3 ltr-rtl 2018-05-04 10:11:24 +02:00
Daniel Gultsch 7b3d871f28 improved logging for node configuration change 2018-05-03 22:44:28 +02:00
Daniel Gultsch 2b492a1fba remove " from fts queries 2018-05-03 19:09:19 +02:00
Daniel Gultsch 89f8b87582 fixed regression of not highlighting current conversation in overview. fixes #3001 2018-05-03 18:30:44 +02:00
Daniel Gultsch 756c1a1004 hide record audio feature if mircophone is not available 2018-05-03 17:01:16 +02:00
Daniel Gultsch b5423b39a0 added null check to Jid.of in edit account 2018-05-03 15:59:14 +02:00
Daniel Gultsch 6fe5c5e770 handle invalid image bounds 2018-05-03 15:38:48 +02:00
Daniel Gultsch 157d644750 organize listeners in lists 2018-05-03 14:54:22 +02:00
Daniel Gultsch 5e1cbf8514 only highlight alphanumeric chars 2018-05-03 13:57:13 +02:00
Daniel Gultsch 9625f191c3 hide treatAsDownloadable in search results 2018-05-02 12:14:24 +02:00
Daniel Gultsch 90135131c0 fixed omemo by default setting for users on same domain. fixes #3006 2018-05-01 23:18:05 +02:00
Daniel Gultsch d3b20544c9 do not invoke onPushFailed() on timeout 2018-05-01 17:35:29 +02:00
Daniel Gultsch 8d5a7c79da fixed crash with samsung recorder 2018-05-01 15:16:10 +02:00
Daniel Gultsch d8439c72fd fixed display in internal map 2018-05-01 14:32:55 +02:00
Daniel Gultsch ee2c118c21 pulled translations from transifex 2018-05-01 12:56:42 +02:00
Daniel Gultsch 949b77c353 make show location depend on plugin setting 2018-05-01 12:55:11 +02:00
Daniel Gultsch 8e17fa285d allow use of share location plugin with setting 2018-05-01 12:03:35 +02:00
Daniel Gultsch 35e6547db4 show keyboard only on fresh activity 2018-05-01 10:47:43 +02:00
Daniel Gultsch 303cc89b61 persist search across device rotations 2018-05-01 10:33:21 +02:00
Daniel Gultsch 2505ac8b77 only search text messages 2018-05-01 09:58:43 +02:00
Daniel Gultsch 438ae34988 fixed search term parser for empty terms 2018-04-30 17:37:39 +02:00
Daniel Gultsch 27f31446c0 search term parsing + highlighting 2018-04-30 17:09:55 +02:00
Daniel Gultsch 542a06f08a creat fts table 2018-04-30 16:06:27 +02:00
Daniel Gultsch b5c60ee779 changed accent color back to blue 2018-04-30 15:17:21 +02:00
Daniel Gultsch 2390839c21 get video dimensions from bitmap instead of meta data 2018-04-30 09:22:59 +02:00
Daniel Gultsch 287c416dac hard code ogg + audio/ mime type to oga 2018-04-29 15:19:13 +02:00
Daniel Gultsch 5c4aacd39e added 'view conversation' to context menu 2018-04-29 14:07:58 +02:00
Daniel Gultsch 43b455974b changed color of online send button 2018-04-29 09:49:45 +02:00
Daniel Gultsch d0c88e6293 check if jid was valid before parsing muc status or event msgs 2018-04-29 09:33:20 +02:00
Daniel Gultsch 3011f875eb highlight search term in search results 2018-04-28 23:50:35 +02:00
Daniel Gultsch effeb7b585 convert empty resources in messages to bare jid 2018-04-28 21:30:30 +02:00
Daniel Gultsch 04f34fb968 Merge branch '2.1.x' 2018-04-28 16:58:27 +02:00
Daniel Gultsch 9963616270 do not crash when inner message contains invalid jid 2018-04-28 16:56:32 +02:00
Daniel Gultsch 6dbaece149 Merge tag '2.1.3' 2018-04-28 16:33:32 +02:00
Daniel Gultsch 6712a2d91f added search result context menu + date separators 2018-04-28 16:32:23 +02:00
Daniel Gultsch 322463bab7 return InvalidJid object instead of null if Jid can not be parsed 2018-04-28 16:26:40 +02:00
Daniel Gultsch 59b5dece96 theming: switched to material green. changed accent color 2018-04-27 14:50:27 +02:00
Daniel Gultsch 2177e575bc use styled colors for online/offline text 2018-04-26 21:50:24 +02:00
Daniel Gultsch 9b2093eba5 dynamically reference app name in version string 2018-04-26 21:21:17 +02:00
Daniel Gultsch 120f7453e5 use GIF to describe gifs instead of image 2018-04-26 21:21:00 +02:00
Daniel Gultsch 3d243866a4 click on avatars in message search opens contact details 2018-04-26 18:53:09 +02:00
Daniel Gultsch e6feb91390 properly cancel pending searchs and scroll to bottom after refresh 2018-04-26 17:02:31 +02:00
Daniel Gultsch 35020702fb very much unoptimized search functionality 2018-04-26 13:22:31 +02:00
Daniel Gultsch 4bbbf86f76 add more styling to search activity 2018-04-26 10:40:29 +02:00
Daniel Gultsch 4c60aae11b mock (non functional) search activity 2018-04-25 20:25:28 +02:00
Daniel Gultsch e2ff51db08 add debug output to how many messages were deleted 2018-04-25 19:32:43 +02:00
Daniel Gultsch bf95ef66eb null check when cleaning avatars for muc 2018-04-25 14:41:33 +02:00
Daniel Gultsch 09276eb396 properly catch and ignore IllegalStateException instead of using commitAllowStateLoss 2018-04-25 14:41:02 +02:00
Daniel Gultsch 2d7e5a12aa increased swipe escape velocity by 10x 2018-04-25 12:56:48 +02:00
Daniel Gultsch 8baef866ce pulled translations from transifex 2018-04-25 12:20:00 +02:00
Daniel Gultsch a11c678770 fine tuned style of toolbar search view 2018-04-24 16:45:37 +02:00
Daniel Gultsch d79f5030be added scrollbars to conversation overview 2018-04-24 14:50:26 +02:00
Daniel Gultsch bb37401028 do not match mentions on word boundries but only when preceeded by white space 2018-04-24 12:31:37 +02:00
Daniel Gultsch de0de48448 allow to delete voice recordings 2018-04-23 20:27:54 +02:00
Daniel Gultsch d844ce4ffb migrate recording activity to view binder 2018-04-23 12:07:19 +02:00
Daniel Gultsch 2f974c3eb2 integrate voice recorder 2018-04-22 20:31:37 +02:00
Daniel Gultsch cfaebbdbd1 scroll to bottom even if last visible item is heigher than view 2018-04-22 16:01:18 +02:00
Daniel Gultsch 2a9413e64d fixed caps hash generation for empty form values 2018-04-22 11:07:00 +02:00
Daniel Gultsch 956f7c6812 use styled borderless button 2018-04-21 22:17:47 +02:00
Daniel Gultsch 1118c4450b fix text size in snackbars 2018-04-21 20:38:14 +02:00
Daniel Gultsch 12127a0b6e do not use omemo by default for own server 2018-04-21 19:52:37 +02:00
Daniel Gultsch fc62cbbc52 fixed updating of server message id after dedup 2018-04-21 19:35:25 +02:00
Daniel Gultsch 2992ba647d always scale to dip 2018-04-21 18:55:16 +02:00
Daniel Gultsch 4599e477b4 fixups for Share location merger 
* use data binder
* introduced styled button
* fixed snackbar showing above button bar
 2018-04-21 18:25:46 +02:00
Daniel Gultsch ee855ab560 Merge branch 'mapping' of https://github.com/SamWhited/Conversations into SamWhited-mapping 2018-04-21 16:57:53 +02:00
Daniel Gultsch b501f4cf72 search for muc pms when fetching last mam reference 2018-04-21 16:57:29 +02:00
Daniel Gultsch 5e1bbea5f0 never use isStranger logic in conversation with self 2018-04-20 17:54:30 +02:00
Daniel Gultsch 7368df94f7 provide access to show qr code from context menu in start conversation activity 2018-04-20 17:12:47 +02:00
Daniel Gultsch 1615aeff87 fixed npe when OS invokes StartConversationsActivity with null action 2018-04-20 11:32:50 +02:00
Daniel Gultsch 9a36627e67 catch run time exception when starting service from event receiver 2018-04-20 10:51:00 +02:00
Daniel Gultsch 7f7b7fca0b pulled translations from transifex 2018-04-20 09:57:02 +02:00
Sam Whited 60f2ce3a74 Use correct theme in mapping activity 2018-04-18 10:58:34 -05:00
Sam Whited a7b6d1f1d8 Use native snackbar on map view 2018-04-18 10:46:56 -05:00
Daniel Gultsch 5272421678 create avatar path before saving avatar 2018-04-18 12:41:16 +02:00
Daniel Gultsch 5170e526c8 fixed npe when conversation in multi mode had jid w/o local part 2018-04-18 10:24:57 +02:00
Daniel Gultsch 71461543a3 pulled translations from transifex 2018-04-18 10:24:10 +02:00
Sam Whited b21d948ecb Merge Open Street Map plugin 2018-04-16 17:39:43 -05:00
Daniel Gultsch 406a5a10f9 removed 'received' prefix from description 2018-04-16 09:55:16 +02:00
Daniel Gultsch 9f34e53b98 replace use file as is blacklist with general don't use app data rule 2018-04-16 09:25:41 +02:00
Daniel Gultsch 08235bffbc pulled translations from transifex 2018-04-15 18:53:27 +02:00
Daniel Gultsch 4a706aad03 catch dead object exceptions when acquiring wake locks 2018-04-15 18:31:58 +02:00
Daniel Gultsch ffc35f5bc5 wrap all calls to notification manager in exception handler to catch dead object exception 2018-04-15 17:47:51 +02:00
Daniel Gultsch 064e5a4f0d make text clickable in openkeychain missing message 2018-04-15 17:30:28 +02:00
Daniel Gultsch be5e39a440 get real file name for files shared from Conversations 2018-04-15 17:10:50 +02:00
Daniel Gultsch 93f405d9a1 add fdroid fennec to use file as is blacklist 2018-04-15 15:05:04 +02:00
Daniel Gultsch 91a061f480 always include omemo fallback message 2018-04-14 21:31:30 +02:00
Daniel Gultsch fa13d2336e include node when requesting disco features 2018-04-14 18:43:11 +02:00
Daniel Gultsch afb7c0592b display avatar in groups 2018-04-14 17:54:04 +02:00
Daniel Gultsch 32a105fa1c fixed condition to accept lmc if user reference exists 2018-04-14 14:55:51 +02:00
Daniel Gultsch c61be89262 keep track of user object in messages 2018-04-12 09:50:33 +02:00
Daniel Gultsch 7fd25abea2 code cleanup in AxolotlService.fetchDeviceIds() 2018-04-12 08:55:50 +02:00
Daniel Gultsch aff2b33e27 load currently open conversation faster 2018-04-11 18:07:40 +02:00
Daniel Gultsch 322667275c all contacts in roster are 'trusted' 2018-04-11 10:07:11 +02:00
Daniel Gultsch 84c5a1b0ae fixed up button refresh in start conversation activity 2018-04-11 09:27:16 +02:00
Daniel Gultsch edfe4a0ccd fixed mixing symbols and letters in unicode detector on pre N 2018-04-11 09:26:56 +02:00
Daniel Gultsch 14f9a51b8b change opacity on emoji only messages 2018-04-11 09:04:16 +02:00
Daniel Gultsch 58a5e67d43 fixed redownload 2018-04-11 08:33:24 +02:00
Harshit Bansal a3e26b95f0 solve fab shadow bug on pre api 19 devices (#2924) 2018-04-10 16:40:15 +02:00
Daniel Gultsch f2389b5404 fixed exception handler 2018-04-07 09:40:09 +02:00
Daniel Gultsch 1f5ab19e50 pulled translations from transifex 2018-04-07 09:03:18 +02:00
Licaon_Kter 28ff08809e Remove leftover strings from legacy (#2948) 2018-04-07 09:01:49 +02:00
esu23 a8dcf3ce0a EnhancedListView deleted from resources (#2944) 
Since RecyclerView it's used now
 2018-04-07 09:01:10 +02:00
Christoph Scholz 816b5bae58 no WelcomeActivity if MAGIC_CREATE_DOMAIN is unset 2018-04-06 16:01:42 +02:00
Ye feng f3913ed364 migrate the RecyclerView 2018-04-06 13:49:57 +02:00
Daniel Gultsch ceac602185 fixed some dark theme issues in message view. fixes #2939 2018-04-05 07:40:54 +02:00
Daniel Gultsch 41972e94eb synchronize around getting last visibile uuid 2018-04-04 20:07:08 +02:00
Daniel Gultsch 4f2c3df329 get escaped localpart as username. should fixed sasl 2018-04-04 20:06:49 +02:00
Daniel Gultsch bda95bc571 make error message for 'not encrypted for this device' 2018-04-04 18:21:22 +02:00
Daniel Gultsch c86bc08c23 change icon size 2018-04-04 09:33:31 +02:00
Ye feng 044ea5c5a9 support contact shortcuts (#2918) 
* support contact shortcuts

* make ShortcutActivity extends AbstractSearchableListItemActivity

* Draw the app icon in the corner of the icon and modify the name of the widget

* updated label and icon size
 2018-04-04 09:33:07 +02:00
Daniel Gultsch 85caaf084b create dedicated exception for not encrypted for this device 2018-04-04 09:11:53 +02:00
Daniel Gultsch c59ee9e137 provide up navigation in start conversation activity 2018-04-03 17:53:08 +02:00
esu23 cc54f02ab3 Fixed small typos (#2933) 
* Fixed typo when removing OTR

There are two encrypt methods avaliable now

* Deleting a repeated resource
 2018-04-02 16:49:00 +02:00
Daniel Gultsch a4dc7eb3ee use font size in action view 2018-04-02 09:51:45 +02:00
af8a524db1 e6d7e5f27f UriHandlerActivity: Always check for XMPP URI validity (#2926) 
Also check for XMPP URI validity if there are no configured accounts
and the WelcomeActivity is active.
 2018-04-02 08:40:27 +02:00
Daniel Gultsch 8b70d945cc made font size selectable 2018-04-01 21:37:21 +02:00
Daniel Gultsch 1500299607 in case fragment starts after activity is bound to service; fetch conversation from uuid 2018-04-01 19:14:53 +02:00
Daniel Gultsch 962ecbedfa made checkboxes and radiobuttons stylable 2018-04-01 09:18:12 +02:00
Daniel Gultsch f0cfbb4681 fixed muc detection for rare cases where muc is hosted on primary domain 2018-03-31 22:01:17 +02:00
Daniel Gultsch c0d977e97d fixed read event when status messages are displayed 2018-03-31 22:00:46 +02:00
Daniel Gultsch 2e934f1517 made all text styleable 2018-03-31 12:16:56 +02:00
Daniel Gultsch f4b26f0bf9 code cleanup 2018-03-31 11:08:04 +02:00
Daniel Gultsch 93ceb9db78 fixed read event when using fab scroll down 2018-03-31 10:57:59 +02:00
Daniel Gultsch aeaa58071c only mark visible messages as read 2018-03-30 21:14:06 +02:00
Daniel Gultsch e1a6ceb49b fixed regression in StartConversationActivity that ignored welcome jid 2018-03-30 15:57:44 +02:00
Daniel Gultsch 2442dabb2a null check for conversation 2018-03-30 12:26:10 +02:00
Daniel Gultsch d27d9d9366 show scroll down button instantly when scrolling up 2018-03-30 10:58:07 +02:00
Daniel Gultsch 419e7f5ea6 introduced sroll to bottom button. based on #2777 by @harshitbansal05 2018-03-30 10:35:52 +02:00
Daniel Gultsch d5c4a987a1 persist some muc configurations 2018-03-30 08:47:37 +02:00
Daniel Gultsch 3dc749b22b remove duplicate call to onConversationArchived() 2018-03-29 16:23:36 +02:00
Daniel Gultsch f2b0a10c22 end view if conversation was archived 2018-03-29 15:08:43 +02:00
Daniel Gultsch a1b3e2d57c hide disable encryption button when omemo is in always mode 2018-03-29 14:26:04 +02:00
Daniel Gultsch 9646783d48 fixed regression of 'add contact' not working. fixes #2916 2018-03-29 13:40:52 +02:00
Daniel Gultsch 5a6527bf4c pulled translations from transifex 2018-03-29 12:02:04 +02:00
Daniel Gultsch a6539be52b introduced tri state omemo setting (off by default, on by default, always) 2018-03-27 15:35:53 +02:00
Daniel Gultsch 06f8d8c5d6 add ruleset to disable omemo-by-default for certain providers 2018-03-26 13:29:01 +02:00
ChaosKid42 536149723e getNextEncryption does not honor ENCYPTION_MASK (#2899) 2018-03-26 12:44:21 +02:00
Daniel Gultsch 1749009d10 put toolbar elevation in dimen file 2018-03-26 10:12:36 +02:00
Daniel Gultsch 786d9895c8 fixed popup menu in dark theme 2018-03-26 05:43:22 +02:00
Daniel Gultsch a32d0c5d20 process receipts only on mam catchup 2018-03-26 05:43:01 +02:00
Daniel Gultsch ecedda8613 reformat 2018-03-25 18:49:49 +02:00
Daniel Gultsch fe8f0bd7f0 make receipt handling work with out of order receipts 2018-03-25 17:22:39 +02:00
Daniel Gultsch 2e8cc12ada do not allow user to quote file 2018-03-24 12:06:06 +01:00
Daniel Gultsch acdf822415 code cleanup in Contact class 2018-03-23 16:59:42 +01:00
Daniel Gultsch ce00767777 ignore bookmark name of 'None' 2018-03-23 16:52:05 +01:00
Daniel Gultsch e8bec4fe40 pulled translations from transifex 2018-03-23 11:39:46 +01:00
Daniel Gultsch c41f574b1f in lack of confirm source dialog in account details only trust scanned uris 2018-03-23 11:39:36 +01:00
Daniel Gultsch ce867758d5 call to update ui after fingerprint verification 2018-03-23 11:28:00 +01:00
Daniel Gultsch 255dd9674e fixed cache key generation for messages w/o full jid 2018-03-22 15:10:29 +01:00
Daniel Gultsch dccd3f1c8e figure out fallbacks with omemo source id 2018-03-22 13:26:35 +01:00
Daniel Gultsch bd3799fe02 messages coming from known muc server are treated as muc when creating conversation 2018-03-22 12:43:08 +01:00
Daniel Gultsch 47fba24296 pulled translations from transifex 2018-03-20 13:00:33 +01:00
Daniel Gultsch 3c61af88a1 StartConversationActivity: persist search across rotation 2018-03-20 12:52:23 +01:00
Daniel Gultsch 6d3be890b7 Merge branch 'qr_scan_fix' of https://github.com/klonfish/Conversations into klonfish-qr_scan_fix 2018-03-20 09:04:17 +01:00
Daniel Gultsch ad768d1938 improved logging while deleting old cache files 2018-03-20 09:04:04 +01:00
klonfish b249c1f36f Improved QR code recognition when screen and camera orientation don't match 2018-03-19 21:43:42 +01:00
Daniel Gultsch 2d59a99833 pulled translations from transifex 2018-03-19 21:06:39 +01:00
Daniel Gultsch b682aeb252 use utf-8 in barcodes 2018-03-19 21:05:20 +01:00
Daniel Gultsch 0f97b44e9f increased LruCache for unicode script detection 2018-03-19 13:32:32 +01:00
Daniel Gultsch 11136f939e commit allowing state loss 2018-03-19 12:29:21 +01:00
Daniel Gultsch 5363470bcf fix getNextEncryption 2018-03-19 10:08:36 +01:00
Daniel Gultsch 442c284c8e prevent double tapping on overflow menu 2018-03-19 09:43:33 +01:00
Daniel Gultsch 6779bf2a29 write roster only for active accounts 2018-03-18 23:19:23 +01:00
Daniel Gultsch 59386e50ac added prosodys enable archive to default room config 2018-03-18 19:41:27 +01:00
Daniel Gultsch cdbab64b03 fixed redownload of deleted http upload messages 2018-03-18 17:34:35 +01:00
Daniel Gultsch ba91fe2698 run roster sync in replacing task manager 2018-03-18 16:46:50 +01:00
Daniel Gultsch 9908af6286 sync roster to disk after roster push 2018-03-18 12:24:28 +01:00
Daniel Gultsch 7e6109a072 removed unecessary logging 2018-03-18 10:32:01 +01:00
Daniel Gultsch 5514958e93 presist http upload availibility 2018-03-18 10:30:15 +01:00
Daniel Gultsch f2ea609b51 code cleanup 2018-03-18 09:47:52 +01:00
Daniel Gultsch 82ba4ce4fc fixed some regressions introduced in toolbar migration 2018-03-18 09:31:37 +01:00
Harshit Bansal f2885575ba replace deprecated action bar with toolbar (#2872) 
* replace deprecated action bar with toolbar

* add toolbar support in each activity

* remove redundant themes made earlier

* add configure action bar method in xmpp activity

* remove android namespace from actionmodeoverlay

* solve bug of scrolling toolbar
 2018-03-18 09:30:22 +01:00
Daniel Gultsch 83a4cb8a11 setReplaceAll=false on emojiCompat for android o 2018-03-17 21:43:18 +01:00
Daniel Gultsch 11dfd87672 show message draft in conversation overview 2018-03-17 19:18:22 +01:00
Daniel Gultsch 9765f26de0 fixed device rotation in settings activity 2018-03-16 12:58:43 +01:00
Daniel Gultsch 182b4c08b5 fixed crash in MessageAdapter caused by empty xmpp: uri 2018-03-16 12:29:11 +01:00
Daniel Gultsch d17a8cdcb9 pulled translations from transifex 2018-03-16 09:46:01 +01:00
Daniel Gultsch dbdbe1b312 pulled translations from transifex 2018-03-15 13:44:51 +01:00
Daniel Gultsch 64f040b631 offer a more convienient way to disable omemo from trust keys dialog 2018-03-15 13:37:08 +01:00
Daniel Gultsch 1bfc0b8da6 trim to original resource if server added something 2018-03-15 08:53:19 +01:00
Daniel Gultsch fe90e70bb1 remove trailing ) in urls 2018-03-14 21:59:18 +01:00
Daniel Gultsch 3c932e9fa6 fixed pm to vistors 2018-03-14 17:31:33 +01:00
Daniel Gultsch c2db940594 do not show snackbar for archived conversations. fixes glitch when leaving muc 2018-03-14 13:05:50 +01:00
Daniel Gultsch 03e88500b9 fixed rotation in choose contact activity 2018-03-14 11:03:08 +01:00
Daniel Gultsch acf0b995ab dynamically get known hosts in dialog 2018-03-14 10:07:52 +01:00
iamharsshit 2af12afb64 add data binding and check in back stack for dialogs 2018-03-14 13:07:04 +05:30
iamharsshit b33725b435 place enter jid dialog in dialog fragment 2018-03-14 13:07:04 +05:30
iamharsshit b48e37f72f replace group dialogs by dialog fragment 2018-03-14 13:07:04 +05:30
Daniel Gultsch 45701448b8 made typing notifications default on new installs 2018-03-14 08:23:46 +01:00
Daniel Gultsch d4a05b8ef3 Merge branch 'master' of github.com:siacs/Conversations 2018-03-14 08:22:18 +01:00