aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-093-3/+97
|\
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-0913-108/+132
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-239-13/+397
|\|
| * 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/urlsteckbrief2016-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-1820-188/+384
| |\
| | * Implements FS#137: build flavorssteckbrief2016-04-182-50/+37
| | * 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 branch 'trz/rebase' into trz/renamelookshe2016-04-1720-134/+361
| | |\ | |_|/ |/| |
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-1711-20/+367
| |/
| * 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 tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-172-0/+48
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-073-6/+124
|\|
| * Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-073-6/+122
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-0/+43
|\|
| * Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
| |\ | |/ |/|
| * Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
| * Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
| * Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
| * Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
| * Removed unnecessary importsteckbrief2016-03-291-1/+0
* | fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1lookshe2016-04-031-20/+0
* | fixed build errorlookshe2016-04-031-0/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
|\|
| * 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-293-2/+161
|\|
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
|\|
| * Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
| |\
| * | 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
* | | wrong import in new classtrz/1.11.2.1lookshe2016-03-271-1/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+20
|\ \ \ | | |/ | |/|
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-273-3/+44
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2514-38/+83
| |\ | |/ |/|
| * Correct notifications to user if swiping with disabled or not connected accou...lookshe2016-03-221-25/+37
| * Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
| * One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| * Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| * FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
|\|
| * Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83