Commit graph

3533 commits

Author SHA1 Message Date
3f38eb3bf4 Fixes FS#180: Conference notification icon missing 2016-04-01 16:10:12 +02:00
51d1d2226a no resize of input field when inserting emojicon (FS#175) 2016-03-30 01:02:00 +02:00
b8f97a7072 Fixes FS#174: Displaying of ASCII emoticons differs 2016-03-30 01:02:00 +02:00
403e5696d2 Logging for FS#80 to identify calling method 2016-03-30 01:02:00 +02:00
steckbrief
75659ddc12 Fixes FS#172: Conversations list not updated on status changes 2016-03-29 23:09:43 +02:00
steckbrief
37c5a7c522 Removed unnecessary import 2016-03-29 22:36:40 +02:00
steckbrief
bcf0d929dd Avoid unnecessary text change on activate account button 2016-03-29 22:30:13 +02:00
steckbrief
1d5d94080a Introduction of a TextViewUtil to easily set attributes for TextViews 2016-03-29 22:28:19 +02:00
steckbrief
6244834096 Implements FS#173: Move access to colors to separate helper class 2016-03-29 11:43:22 +02:00
steckbrief
0c0676b7db Merge branch 'master' of repos.thedevstack.de:conversations-plus 2016-03-28 23:19:19 +02:00
steckbrief
f2e361d273 Fixes FS#170: Message Details: Status display has different Text color 2016-03-28 23:17:24 +02:00
steckbrief
eda5a98448 Implements FS#176: error logging for httpupload improved 2016-03-28 23:15:24 +02:00
fd6f0a842b adjusted changelog and corrected wrong version in build.gradle due to merge 2016-03-27 17:17:07 +02:00
9773b16a98 Fixes FS#166 - Images cannot be opened since storing in private image folder 2016-03-27 14:41:25 +02:00
711ab9f2b1 Merge branch 'trz/rebase' into trz/rename 2016-03-25 20:13:51 +01:00
d25ab854da Merge branch 'trz/rebase' (early part) into trz/rename 2016-03-25 20:06:01 +01:00
27c16b4b9a FS#169 - Merge Conversations 1.11.2 into Conversations+ dev 2016-03-25 20:04:37 +01:00
Daniel Gultsch
46be514b4d version bump to 1.11.2 and changelog 2016-03-23 19:24:54 +01:00
Daniel Gultsch
a9b66e3ea5 allow to delete attachments. fixes #1539 2016-03-23 19:23:22 +01:00
86d16b030b Merge branch 'trz/rename' into trz/rebase 2016-03-23 13:41:58 +01:00
f306292ed6 deleted unused library (FS#51) 2016-03-23 13:40:53 +01:00
f3bebf5927 Merge branch 'trz/rename' into trz/rebase 2016-03-23 13:17:45 +01:00
977ffc5f48 pulled from transifex 2016-03-23 13:16:05 +01:00
Daniel Gultsch
281cb65046 only add image files to media scanner 2016-03-23 12:20:09 +01:00
Daniel Gultsch
564113669e update build deps 2016-03-23 12:04:23 +01:00
Daniel Gultsch
0baa2dd03e Merge pull request #1780 from licaon-kter/patch-1
Typo `attempt`
2016-03-22 11:00:37 +01:00
licaon-kter
6ba90ec43c Typo attempt 2016-03-22 11:54:45 +02:00
4085f2a80e Merge branch 'trz/rename' into trz/rebase 2016-03-22 00:58:52 +01:00
02f958ce76 Correct notifications to user if swiping with disabled or not connected account (FS#159) 2016-03-22 00:53:00 +01:00
c0267bb8f6 Fixes FS#87 - Crash on load messages after delete account 2016-03-22 00:16:54 +01:00
de3894f77c Merge branch 'trz/rename' into trz/rebase 2016-03-21 03:12:34 +01:00
47b982524e One more fix in Message.equals() (FS#104) 2016-03-21 03:11:02 +01:00
dd8dac73d2 Merge branch 'trz/rename' into trz/rebase 2016-03-20 20:16:35 +01:00
00fc37b326 changed configuration to conversations+ project (FS#32) 2016-03-20 20:13:59 +01:00
1d9a840c0b Merge branch 'trz/rename' into trz/rebase 2016-03-20 17:57:22 +01:00
9bcacdb8b9 Show file name instead of mime type (FS#102) 2016-03-20 17:56:01 +01:00
a8db6be4eb Merge branch 'trz/rename' into trz/rebase 2016-03-20 17:37:44 +01:00
Daniel Gultsch
135c8567a5 show room nick for /me command in sent muc messages. fixes #1773 2016-03-20 17:33:42 +01:00
ea6564c81a FS#104 - Fix Message.equals() 2016-03-20 17:28:39 +01:00
Daniel Gultsch
ac09011690 be less strict when sharing EXTRA_TEXT intents 2016-03-20 17:25:16 +01:00
Daniel Gultsch
7df24407dc be more careful to avoid creating multiple connections 2016-03-20 17:24:41 +01:00
Daniel Gultsch
b51ce43d36 don't show v\omemo keys as such if not enabled 2016-03-20 17:24:15 +01:00
d1e2023bd9 Merge branch 'trz/rename' into trz/rebase 2016-03-20 16:15:43 +01:00
90bbe035e9 Fixes FS#143 - Displaying of emoticons too large 2016-03-20 16:15:17 +01:00
50dad467ee Merge branch 'trz/rename' into trz/rebase 2016-03-20 15:14:42 +01:00
d535496598 Merge branch 'trz/rename' (early part) into trz/rebase 2016-03-20 15:14:36 +01:00
89082f1c68 Fixes FS#168 - Not possible to share more than one picture at once 2016-03-20 13:04:27 +01:00
a92ef6f077 fixed merge error 2016-03-20 02:34:01 +01:00
75c8a4a695 Merge branch 'trz/rebase' (early part) into trz/rename 2016-03-20 02:31:09 +01:00
ad8e8344c0 Merge branch 'trz/rebase' (early part) into trz/rename 2016-03-20 02:29:46 +01:00