aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed merge errorlookshe2016-03-201-1/+1
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-202-19/+25
|\
| * fixed merge errorslookshe2016-03-201-1/+1
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-204-59/+100
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-6/+3
| |\
* | | Fixes FS#164lookshe2016-03-181-8/+0
* | | completely implements FS#161lookshe2016-03-171-1/+9
* | | once again: FS#34 - review all calls for String.trim()lookshe2016-03-141-1/+1
| |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-7/+4
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-3/+3
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+1
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-4/+7
| |\ \
* | | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
| |_|/ |/| |
* | | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-114-17/+8
| |/ |/|
* | Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-101-2/+1
* | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-102-4/+6
* | reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0813-204/+400
|\|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0637-1201/+3965
|\|
| * Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-3/+3
| * Imports organizedsteckbrief2016-02-125-6/+2
| * Compilation errors and merge mixups fixedsteckbrief2016-02-111-6/+7
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-171-1/+1
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-3/+93
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-2/+32
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-7/+2
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-2/+33
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-035-1/+229
| |\ \ \ \ \ \
| * | | | | | | fixed importstrz/1.5.2.2lookshe2015-10-054-10/+10
| * | | | | | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0530-9405/+0
* | | | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-151-1/+1
* | | | | | | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
* | | | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-139-23/+24
* | | | | | | | Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+11
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Log error in case logcat command could not be executed; Show toast in case no...steckbrief2015-12-171-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-161-2/+90
* | | | | | Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
| |_|_|_|/ |/| | | |
* | | | | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-107-19/+67
* | | | | Fix flagging no more messages on server for conversationsteckbrief2015-12-062-1/+14
* | | | | Implements FS#83: Reload from last received messagesteckbrief2015-12-043-16/+44
| |_|_|/ |/| | |
* | | | Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-042-15/+8
| |_|/ |/| |
* | | Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-206-13/+44
* | | FileBackend splitted into several util classes for separate concerns: AvatarU...steckbrief2015-11-065-19/+13
| |/ |/|
* | Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0310-121/+351
* | Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+1
* | Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-219-143/+107
* | added comment for clarification, why the timestamp of the first msg of msg li...steckbrief2015-10-171-1/+1
* | Removed unused importssteckbrief2015-10-151-4/+0
* | Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-151-10/+32
* | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-051-2/+2
|/