| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-04 | 1 | -1/+1 |
|\ |
|
| * | Fixes FS#99: Adjust namespace according to XEP-0363 | steckbrief | 2016-01-04 | 1 | -1/+1 |
* | | 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 | 15 | -200/+345 |
|\| |
|
| * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis... | steckbrief | 2015-12-16 | 14 | -198/+342 |
| * | 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-11 | 3 | -208/+151 |
|\| |
|
| * | Removed stupid DNS query code | steckbrief | 2015-12-11 | 3 | -205/+147 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 35 | -421/+99 |
|\| |
|
| * | Moved logcat to a module, increased error robustness for loading last messages | steckbrief | 2015-12-10 | 35 | -407/+73 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-06 | 3 | -2/+15 |
|\| |
|
| * | Fix flagging no more messages on server for conversation | steckbrief | 2015-12-06 | 3 | -2/+15 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 3 | -16/+44 |
|\| |
|
| * | 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 | 3 | -16/+9 |
|\| |
|
| * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 3 | -16/+9 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 2 | -2/+4 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 1 | -1/+1 |
|\| |
|
| * | Fixed compile error in inner class | steckbrief | 2015-12-02 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 36 | -227/+640 |
|\| |
|
| * | Partially implements FS#6: Conference ID changed to c+bugs@confere | steckbrief | 2015-11-20 | 1 | -1/+1 |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti... | steckbrief | 2015-11-20 | 36 | -226/+639 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-06 | 22 | -579/+786 |
|\| |
|
| * | FileBackend splitted into several util classes for separate concerns: AvatarU... | steckbrief | 2015-11-06 | 22 | -580/+771 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 15 | -171/+545 |
|\| |
|
| * | Implements FS#26: Introduction of dialog to choose whether to resize a pictur... | steckbrief | 2015-11-03 | 14 | -173/+521 |
| * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 3 | -0/+24 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 9 | -27/+38 |
|\| |
|
| * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values... | steckbrief | 2015-10-23 | 9 | -27/+36 |
* | | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 25 | -351/+536 |
|\| |
|
| * | Access to preferences moved to global utility class ConversationsPlusPreferen... | steckbrief | 2015-10-21 | 24 | -350/+532 |
| * | added comment for clarification, why the timestamp of the first msg of msg li... | steckbrief | 2015-10-17 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-15 | 3 | -36/+64 |
|\| |
|
| * | Removed unused imports | steckbrief | 2015-10-15 | 1 | -4/+0 |
| * | Fixes FS#81 - avoid jumps after loading messages | steckbrief | 2015-10-15 | 2 | -32/+64 |
* | | fix imports and namespaces | steckbrief | 2015-10-05 | 1 | -0/+2 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 6 | -35/+74 |
|\| |
|
| * | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac... | steckbrief | 2015-10-05 | 6 | -35/+74 |
* | | fixed imports | lookshe | 2015-10-05 | 5 | -11/+11 |
* | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 10 | -9/+458 |
|\| |
|
| * | Publishing additional information in message details dialog such as message t... | steckbrief | 2015-10-04 | 1 | -18/+142 |
| * | Note added where to change sth. for FS#70 | steckbrief | 2015-10-04 | 1 | -1/+2 |
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op... | steckbrief | 2015-10-04 | 8 | -3/+321 |
| * | Fixes FS#49: Highlight the selected conversation in list | steckbrief | 2015-09-02 | 2 | -6/+9 |
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-21 | 1 | -3/+3 |
| |\
| |/
|/| |
|
| * | moved merged files to correct location0.0.3 | lookshe | 2015-08-16 | 3 | -15/+16 |
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-16 | 16 | -409/+388 |
| |\ |
|
| * | | resolve of some compiler errors0.0.2 | lookshe | 2015-08-13 | 3 | -1/+3 |
| * | | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-11 | 61 | -2115/+3783 |
| |\ \ |
|