aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-152-0/+2
|\
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-152-0/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-145-0/+0
|\|
| * Fixes FS#76: Notification adapted to new logosteckbrief2016-01-145-0/+0
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-081-1/+18
|\|
| * Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+18
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-172-0/+2
|\|
| * Log error in case logcat command could not be executed; Show toast in case no...steckbrief2015-12-172-0/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-163-19/+40
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-163-19/+40
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-4/+6
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-041-4/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\|
| * Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0420-108/+115
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-0420-108/+115
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-025-0/+40
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-0/+1
| * Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-205-0/+39
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-035-1/+56
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-033-0/+28
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-304-1/+28
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-232-3/+3
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-232-3/+3
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-162-1/+4
|\|
| * Fixes FS#82: Background color of conversation list item set to primary backgr...steckbrief2015-10-162-1/+4
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0513-7/+242
|\|
| * Publishing additional information in message details dialog such as message t...steckbrief2015-10-043-10/+93
| * Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...steckbrief2015-10-045-1/+152
| * New logo added, fixes FS#56steckbrief2015-10-045-0/+0
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-021-4/+5
| * Fixes FS#50: Replace phone numbers and email addresses in messages with linkssteckbrief2015-09-022-2/+2
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1619-0/+8
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11351-584/+3349
| |\
| * | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-193-6/+6
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-1618-0/+0
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-121-0/+8
| |/ |/|
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-11351-584/+3349
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
|/
* moved color picker to libslookshe2015-04-1517-151/+0
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-144-68/+83
* changed last message in overview also to EmojiconTextView for displaying smil...lookshe2015-04-121-3/+6
* added settings for accepting and downloading fileslookshe2015-04-1221-26/+57
* add missing resource fileslookshe2015-04-128-0/+0
* whatsapp-like smiley implementationlookshe2015-04-123-7/+22
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-113-3/+13
|\
| * differ between received and read messagelookshe2015-04-113-3/+13
* | Color choose dialogsteckbrief2015-04-1120-4/+164
|/