aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-6/+7
|\
| * Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-091-6/+7
| * Fixed minor class cast issuesteckbrief2016-01-161-4/+4
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1510-87/+287
|\|
| * Introducing some specialized IqPacketGeneratorssteckbrief2016-01-1510-87/+283
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-154-65/+62
|\|
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-154-65/+62
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-3/+3
|\|
| * Implements FS#111: Compress resized picture with PNG formatsteckbrief2016-01-151-3/+3
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-2/+12
|\|
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-1320-240/+325
|\|
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-1319-239/+318
| * Publish avatars as PNGsteckbrief2016-01-131-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-081-1/+12
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+11
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-041-1/+1
|\|
| * Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-171-1/+1
|\|
| * Log error in case logcat command could not be executed; Show toast in case no...steckbrief2015-12-171-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1615-200/+345
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-1614-198/+342
| * Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-113-208/+151
|\|
| * Removed stupid DNS query codesteckbrief2015-12-113-205/+147
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1035-421/+99
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1035-407/+73
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-063-2/+15
|\|
| * Fix flagging no more messages on server for conversationsteckbrief2015-12-063-2/+15
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-043-16/+44
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-043-16/+44
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-043-16/+9
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-043-16/+9
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-042-2/+4
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-1/+1
|\|
| * Fixed compile error in inner classsteckbrief2015-12-021-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0236-227/+640
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-1/+1
| * Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-2036-226/+639
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0622-579/+786
|\|
| * FileBackend splitted into several util classes for separate concerns: AvatarU...steckbrief2015-11-0622-580/+771
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0315-171/+545
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0314-173/+521
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-303-0/+24
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-239-27/+38
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-239-27/+36
* | Merge trz/rename into trz/rebasesteckbrief2015-10-2225-351/+536
|\|
| * Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-2124-350/+532
| * added comment for clarification, why the timestamp of the first msg of msg li...steckbrief2015-10-171-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-153-36/+64
|\|