aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-0/+58
|\
| * services.filetransfer.httpupload moved to new namespace services.filetransfer...steckbrief2016-08-231-1/+1
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-0/+8
| * FileTransfer reworked (first steps - functionality as is), HttpUploadsteckbrief2016-05-291-0/+50
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-1/+2
|\|
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-231-2/+1
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-0/+2
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-0/+1
| |\
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
| |/ |/|
* | Imports organizedsteckbrief2016-02-121-2/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-0/+13
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-161-0/+12
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-0/+20
|\|
| * FileBackend splitted into several util classes for separate concerns: AvatarU...steckbrief2015-11-061-0/+21
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-0/+4
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-231-0/+4
* | Merge trz/rename into trz/rebasesteckbrief2015-10-221-0/+2
|\|
| * Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-211-0/+2
* | fix imports and namespacessteckbrief2015-10-051-0/+2
|/
* Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-051-0/+62