aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes conditions for cplus db upgradessteckbrief2016-08-231-2/+2
* Javadoc added and access to xmppConnectionService movedsteckbrief2016-08-232-5/+14
* Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-232-9/+39
* Confirmation dialog added before sending delete command for remote filesteckbrief2016-08-236-23/+84
* services.filetransfer.httpupload moved to new namespace services.filetransfer...steckbrief2016-08-2311-11/+11
* xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ...steckbrief2016-08-2315-28/+22
* Improved error handling for httpuploadsteckbrief2016-08-221-4/+7
* Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-2220-15/+542
* Merge remote-tracking branch 'remotes/origin/filetransfer'steckbrief2016-08-2246-205/+1679
|\
| * Related to FS#131, FS#129, FS#220:steckbrief2016-06-0614-83/+472
| * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-2939-199/+1165
| * Fixed javadoc of HttpUploadHintsteckbrief2016-05-261-1/+11
| * Fixed javadoc of PubSub Element Generation/Parsingsteckbrief2016-05-263-5/+114
* | Implements FS#227: Store password encrypted in internal databasesteckbrief2016-07-163-3/+131
|/
* 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/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
| |\
| | * 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
| | |\
| | * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-0/+43
| | |\ \
* | | | | 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
| |_|/ |/| |
* | | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-073-6/+122
| |/ |/|
* | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
|\|
| * 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
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-293-2/+161
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
| |\ \ \
| * | | | 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#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
| |_|_|_|/ |/| | | |
* | | | | 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
| |_|_|/ |/| | |
* | | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
| |_|/ |/| |
* | | Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
|\ \ \ | | |/ | |/|