aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-093-2/+3
|\
| * Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-092-2/+2
| * implementation hint for FS#96 addedsteckbrief2016-02-091-0/+1
* | 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-153-2/+14
|\|
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-153-2/+14
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-145-0/+0
|\|
| * Fixes FS#76: Notification adapted to new logosteckbrief2016-01-145-0/+0
* | 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-082-2/+30
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-082-2/+29
* | 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-173-1/+3
|\|
| * Log error in case logcat command could not be executed; Show toast in case no...steckbrief2015-12-173-1/+3
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1618-219/+385
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-1617-217/+382
| * 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-1036-422/+100
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1036-408/+74
* | 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-044-20/+50
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-044-20/+50
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\|
| * Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0423-124/+124
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-0423-124/+124
* | 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-0242-227/+688
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-202-1/+2
| * Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-2042-226/+686
* | 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-0320-172/+601
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0317-173/+549