aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-154-3/+18
|\
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-154-3/+18
* | 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-083-2/+33
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-083-2/+32
* | 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-175-7/+42
|\|
| * Log error in case logcat command could not be executed; Show toast in case no...steckbrief2015-12-175-7/+42
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-1651-2465/+423
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-1618-217/+385
| * Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
| * Fixes FS#88, Code cleanupsteckbrief2015-12-141-4/+5
| * Fixes FS#88: Avoid smilie repacement in time messagessteckbrief2015-12-141-4/+9
| * Build cleanup: libraries added as local resources, removed unused proguard co...steckbrief2015-12-1431-2240/+23
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-113-3271/+0
|\|
| * Removed unnecessary filessteckbrief2015-12-113-3271/+0
* | 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-1047-415/+280
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1047-71/+237
* | 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-0416-22/+2168
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-0416-22/+2168
* | 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-0243-227/+690
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-203-1/+4
| * 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-0321-172/+603
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0318-173/+551
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-307-1/+52
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-2312-30/+43
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-2312-30/+41
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-221-1/+2
|\|
| * Implements FS#78: Allow installation on SD cardsteckbrief2015-10-221-1/+2
* | Merge trz/rename into trz/rebasesteckbrief2015-10-2225-351/+536
|\|
| * Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-2124-350/+532