| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 3 | -3271/+0 |
|\ |
|
| * | Removed unnecessary files | steckbrief | 2015-12-11 | 3 | -3271/+0 |
* | | 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 | 47 | -415/+280 |
|\| |
|
| * | Moved logcat to a module, increased error robustness for loading last messages | steckbrief | 2015-12-10 | 47 | -71/+237 |
* | | 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 | 16 | -22/+2168 |
|\| |
|
| * | Implements FS#83: Reload from last received message | steckbrief | 2015-12-04 | 16 | -22/+2168 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -3/+6 |
|\| |
|
| * | Implements FS#89 - Change about information | steckbrief | 2015-12-04 | 1 | -3/+6 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 23 | -124/+124 |
|\| |
|
| * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 23 | -124/+124 |
* | | 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 | 43 | -227/+690 |
|\| |
|
| * | Partially implements FS#6: Conference ID changed to c+bugs@confere | steckbrief | 2015-11-20 | 3 | -1/+4 |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti... | steckbrief | 2015-11-20 | 42 | -226/+686 |
* | | 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 | 21 | -172/+603 |
|\| |
|
| * | Implements FS#26: Introduction of dialog to choose whether to resize a pictur... | steckbrief | 2015-11-03 | 18 | -173/+551 |
| * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 7 | -1/+52 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 12 | -30/+43 |
|\| |
|
| * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values... | steckbrief | 2015-10-23 | 12 | -30/+41 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-22 | 1 | -1/+2 |
|\| |
|
| * | Implements FS#78: Allow installation on SD card | steckbrief | 2015-10-22 | 1 | -1/+2 |
* | | 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-16 | 3 | -1/+18 |
|\| |
|
| * | C+ changelog updated | steckbrief | 2015-10-16 | 1 | -1/+2 |
| * | Fixes FS#82: Background color of conversation list item set to primary backgr... | steckbrief | 2015-10-16 | 2 | -1/+4 |
| * | Conversations Plus ChangeLog added | steckbrief | 2015-10-16 | 1 | -0/+13 |
* | | 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 | 2 | -1/+3 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 7 | -36/+76 |
|\| |
|
| * | Merge branch 'master' of ssh://git.fucktheforce.de/conversations-plus | steckbrief | 2015-10-05 | 1 | -2/+2 |
| |\ |
|
| * | | Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac... | steckbrief | 2015-10-05 | 7 | -36/+76 |
* | | | fixed importstrz/1.5.2.2 | lookshe | 2015-10-05 | 5 | -11/+11 |
* | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 26 | -19/+1151 |
|\ \ \
| | |/
| |/| |
|
| * | | version bump to 0.0.5 | lookshe | 2015-10-05 | 1 | -2/+2 |
| |/ |
|
| * | Publishing additional information in message details dialog such as message t... | steckbrief | 2015-10-04 | 4 | -28/+235 |
| * | 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 | 13 | -4/+473 |
| * | New logo added, fixes FS#56 | steckbrief | 2015-10-04 | 7 | -1/+449 |