| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-14 | 5 | -0/+0 |
|\ |
|
| * | Fixes FS#76: Notification adapted to new logo | steckbrief | 2016-01-14 | 5 | -0/+0 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-08 | 1 | -1/+18 |
|\| |
|
| * | Fixes FS#107, Implements FS#77 | steckbrief | 2016-01-08 | 1 | -1/+18 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-17 | 2 | -0/+2 |
|\| |
|
| * | Log error in case logcat command could not be executed; Show toast in case no... | steckbrief | 2015-12-17 | 2 | -0/+2 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 3 | -19/+40 |
|\| |
|
| * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis... | steckbrief | 2015-12-16 | 3 | -19/+40 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -4/+6 |
|\| |
|
| * | Implements FS#83: Reload from last received message | steckbrief | 2015-12-04 | 1 | -4/+6 |
* | | 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 | 20 | -108/+115 |
|\| |
|
| * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 20 | -108/+115 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-02 | 5 | -0/+40 |
|\| |
|
| * | Partially implements FS#6: Conference ID changed to c+bugs@confere | steckbrief | 2015-11-20 | 1 | -0/+1 |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti... | steckbrief | 2015-11-20 | 5 | -0/+39 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-03 | 5 | -1/+56 |
|\| |
|
| * | Implements FS#26: Introduction of dialog to choose whether to resize a pictur... | steckbrief | 2015-11-03 | 3 | -0/+28 |
| * | Implements FS#24: Introduce setting for picture resizing | steckbrief | 2015-10-30 | 4 | -1/+28 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 2 | -3/+3 |
|\| |
|
| * | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values... | steckbrief | 2015-10-23 | 2 | -3/+3 |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-16 | 2 | -1/+4 |
|\| |
|
| * | Fixes FS#82: Background color of conversation list item set to primary backgr... | steckbrief | 2015-10-16 | 2 | -1/+4 |
* | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2015-10-05 | 13 | -7/+242 |
|\| |
|
| * | Publishing additional information in message details dialog such as message t... | steckbrief | 2015-10-04 | 3 | -10/+93 |
| * | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op... | steckbrief | 2015-10-04 | 5 | -1/+152 |
| * | New logo added, fixes FS#56 | steckbrief | 2015-10-04 | 5 | -0/+0 |
| * | Fixes FS#49: Highlight the selected conversation in list | steckbrief | 2015-09-02 | 1 | -4/+5 |
| * | Fixes FS#50: Replace phone numbers and email addresses in messages with links | steckbrief | 2015-09-02 | 2 | -2/+2 |
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-16 | 19 | -0/+8 |
| |\
| |/
|/| |
|
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2015-08-11 | 351 | -584/+3349 |
| |\ |
|
| * | | App-Name changed to "Conversations+" in strings.xml | steckbrief | 2015-06-19 | 1 | -1/+1 |
| * | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -2/+9 |
| * | | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 3 | -6/+6 |
* | | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module | lookshe | 2015-08-16 | 18 | -0/+0 |
* | | | - Introduction of SwipeRefreshLayout for conversation view | steckbrief | 2015-08-12 | 1 | -0/+8 |
| |/
|/| |
|
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1 | lookshe | 2015-08-11 | 351 | -584/+3349 |
* | | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -2/+9 |
|/ |
|
* | moved color picker to libs | lookshe | 2015-04-15 | 17 | -151/+0 |
* | changed received and read confirmation setting to one list and put it to sett... | lookshe | 2015-04-14 | 4 | -68/+83 |
* | changed last message in overview also to EmojiconTextView for displaying smil... | lookshe | 2015-04-12 | 1 | -3/+6 |
* | added settings for accepting and downloading files | lookshe | 2015-04-12 | 21 | -26/+57 |
* | add missing resource files | lookshe | 2015-04-12 | 8 | -0/+0 |
* | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 3 | -7/+22 |
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz... | steckbrief | 2015-04-11 | 3 | -3/+13 |
|\ |
|
| * | differ between received and read message | lookshe | 2015-04-11 | 3 | -3/+13 |
* | | Color choose dialog | steckbrief | 2015-04-11 | 20 | -4/+164 |
|/ |
|
* | no trim of messages or password | lookshe | 2015-04-11 | 2 | -0/+4 |
* | Configurable LED color (Attention: Expert setting because currently only text... | steckbrief | 2015-03-31 | 2 | -0/+7 |