aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-076-56/+131
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-0612-144/+135
| |\ \ \
| * | | | Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-04-060-0/+0
| / / /
* | | / DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1717-38/+393
| |_|/ |/| |
* | | 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
| |/ |/|
* | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-076-56/+129
|/
* Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
* 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
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-1110-140/+14
|\
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-1110-139/+13
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
|\|
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-49/+52
|\|
| * Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-103-12/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|/
* Merge remote branch 'master'steckbrief2016-03-084-22/+21
* Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
* reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
* Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaresteckbrief2016-03-081-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 22:33:04 +0000