aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Implements FS#217: Rework display of /me messagesmessage_display_reworksteckbrief2016-06-128-132/+366
* Related to FS#140: avatar dimensions moved from hardcoded to dimens.xmlsteckbrief2016-06-074-8/+9
* Related to FS#140, Logo implementation moved to FloatingActionButtonsteckbrief2016-06-0719-231/+208
* Open conference details or contact details while clicking on avatar logosteckbrief2016-05-172-4/+82
* Do not show contact's avatar on every message, avoid loading own avatar, only...steckbrief2016-05-161-28/+33
* avatar displayed as a circle, positioning adjusted, colors changed back to co...steckbrief2016-05-169-68/+182
* Merge branch 'master' into message_display_reworksteckbrief2016-05-1330-179/+681
|\
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-238-48/+138
| * Related to FS#134: check if oldversion is smaller then new version on upgradi...steckbrief2016-04-231-2/+1
| * Removed download decision MUST if the message contains jabber:x:oob:oob/urlintroduce_cplus_database_versionsteckbrief2016-04-191-3/+0
| * Persist Message.treatAsDownloadablesteckbrief2016-04-192-2/+15
| * Related to FS#134: Set Message flags according to httpupload hintsteckbrief2016-04-193-0/+9
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1870-312/+638
| |\
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1717-38/+393
* | | Merge branch 'master' into message_display_reworksteckbrief2016-04-2082-530/+909
|\ \ \ | | |/ | |/|
| * | Implements FS#137: build flavorssteckbrief2016-04-184-50/+89
| * | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-182-8/+1
| * | Related to FS#199: Removed unnecessary build configuration variable to hide d...steckbrief2016-04-182-6/+3
| * | Related to FS#199: Removed unnecessary differentiation between a conversation...steckbrief2016-04-183-16/+1
| /
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-162-3/+8
| | |\ | | |/ | |/|
| * | Fixed null pointer exception in case of IOException before uploading file to ...steckbrief2016-04-161-2/+7
| * | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-076-56/+131
| | |\ | | |/ | |/|
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-076-56/+129
| | * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-0612-144/+135
| | |\ | | |/ | |/|
| * | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
| /
| * Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-04-060-0/+0
* basic overlay for avatar as 'logo' added to action barsteckbrief2016-04-064-3/+94
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-301-1/+3
* Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-20/+9
|\
| * Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-290-0/+0
|\|
| * Removed unnecessary importsteckbrief2016-03-291-1/+0
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-296-70/+103
|\|
| * Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| * Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-296-69/+99
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-2917-102/+246
|\|
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2917-102/+239
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-283-5/+9
|/
* Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-287-6/+68
* Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
* Implements FS#176: error logging for httpupload improvedsteckbrief2016-03-281-1/+7
* Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
* Merge branch 'master' of git.fucktheforce.de:conversations-plussteckbrief2016-03-187-39/+96
* Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-125-97/+16
| |\ | |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
/
* Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-03-120-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 14:52:19 +0000