| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | fixed merge errors | lookshe | 2016-03-20 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -6/+3 |
| |\ |
|
| | * | Fixes FS#155: Check FileHelper vs. FileUtils | steckbrief | 2016-03-12 | 2 | -7/+4 |
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-12 | 1 | -3/+3 |
| | |\
| |/
|/| |
|
| | * | Fixes FS#51: Change toggle in Account Management back to standard | steckbrief | 2016-03-11 | 3 | -77/+10 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 1 | -1/+1 |
| |\| |
|
| | * | Fixes FS#139: Do not merge messages at all | steckbrief | 2016-03-11 | 4 | -17/+8 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 2 | -4/+7 |
| |\| |
|
| | * | Fixes FS#157: Trigger loading messages from MAM in MUC does not end | steckbrief | 2016-03-10 | 1 | -2/+1 |
| | * | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 2 | -4/+6 |
| | * | reset link and highlight colors to system default | steckbrief | 2016-03-08 | 1 | -17/+20 |
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 13 | -204/+400 |
| | |\
| |/
|/| |
|
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 37 | -1201/+3965 |
| | |\
| |/
|/| |
|
| | * | Moved all avatar related work to AvatarService | steckbrief | 2016-01-15 | 1 | -1/+1 |
| | * | Implements FS#64: Show who wrote last message in conversation overview | steckbrief | 2016-01-15 | 1 | -2/+12 |
| | * | Moved all avatar related work to AvatarService | steckbrief | 2016-01-13 | 9 | -23/+24 |
| | * | Fixes FS#107, Implements FS#77 | steckbrief | 2016-01-08 | 1 | -1/+11 |
| * | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 1 | -3/+3 |
| * | | Imports organized | steckbrief | 2016-02-12 | 5 | -6/+2 |
| * | | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 1 | -6/+7 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-17 | 1 | -1/+1 |
| |\| |
|
| | * | Log error in case logcat command could not be executed; Show toast in case no... | steckbrief | 2015-12-17 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 2 | -3/+93 |
| |\| |
|
| | * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis... | steckbrief | 2015-12-16 | 1 | -2/+90 |
| | * | Fixes FS#95: NPE when opening message details for failed file transfer | steckbrief | 2015-12-16 | 1 | -1/+2 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 3 | -2/+32 |
| |\| |
|
| | * | Moved logcat to a module, increased error robustness for loading last messages | steckbrief | 2015-12-10 | 7 | -19/+67 |
| | * | Fix flagging no more messages on server for conversation | steckbrief | 2015-12-06 | 2 | -1/+14 |
| | * | Implements FS#83: Reload from last received message | steckbrief | 2015-12-04 | 3 | -16/+44 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -7/+2 |
| |\| |
|
| | * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 2 | -15/+8 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 2 | -2/+33 |
| |\| |
|
| | * | Implements FS#67: Introduce central logging class to use log prefix, new acti... | steckbrief | 2015-11-20 | 6 | -13/+44 |
| | * | FileBackend splitted into several util classes for separate concerns: AvatarU... | steckbrief | 2015-11-06 | 5 | -19/+13 |
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 5 | -1/+229 |
| |\| |
|
| | * | Implements FS#26: Introduction of dialog to choose whether to resize a pictur... | steckbrief | 2015-11-03 | 10 | -121/+351 |
| | * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 1 | -0/+1 |
| | * | Access to preferences moved to global utility class ConversationsPlusPreferen... | steckbrief | 2015-10-21 | 9 | -143/+107 |
| | * | added comment for clarification, why the timestamp of the first msg of msg li... | steckbrief | 2015-10-17 | 1 | -1/+1 |
| | * | Removed unused imports | steckbrief | 2015-10-15 | 1 | -4/+0 |
| | * | Fixes FS#81 - avoid jumps after loading messages | steckbrief | 2015-10-15 | 1 | -10/+32 |
| | * | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac... | steckbrief | 2015-10-05 | 1 | -2/+2 |
| * | | fixed importstrz/1.5.2.2 | lookshe | 2015-10-05 | 4 | -10/+10 |
| * | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 30 | -9405/+0 |
| |/ |
|
| * | Publishing additional information in message details dialog such as message t... | steckbrief | 2015-10-04 | 1 | -18/+142 |
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op... | steckbrief | 2015-10-04 | 7 | -3/+303 |
| * | Fixes FS#49: Highlight the selected conversation in list | steckbrief | 2015-09-02 | 2 | -6/+9 |
| * | moved merged files to correct location | lookshe | 2015-08-16 | 3 | -0/+167 |
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-16 | 5 | -213/+120 |
| * | resolve of some compiler errors | lookshe | 2015-08-13 | 1 | -0/+1 |
