aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
|/
* no trim of messages or passwordlookshe2015-04-112-0/+4
* Configurable LED color (Attention: Expert setting because currently only text...steckbrief2015-03-312-0/+7
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3034-93/+1328
|\
| * pulled translationsiNPUTmice2015-03-225-0/+21
| * pulled more translationsiNPUTmice2015-03-191-0/+5
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-182-0/+13
| * pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
| * open location directly from notificationiNPUTmice2015-03-105-0/+0
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-0/+2
| * display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-072-5/+15
| * pulled new translations from transifexiNPUTmice2015-02-275-23/+191
| * pulled new translations from transifexiNPUTmice2015-02-236-35/+84
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-212-0/+11
| * pulled translations from transifexiNPUTmice2015-02-1610-28/+647
| * added actions to error notificationiNPUTmice2015-02-1011-0/+1
* | Merge master-originsteckbrief2015-02-20191-4295/+6099
|\|
| * Remove another unused resourceSam Whited2015-02-015-0/+0
| * Merge pull request #955 from SamWhited/unused_resourcesDaniel Gultsch2015-02-0124-0/+0
| |\
| | * Remove unused resourcesSam Whited2015-02-0124-0/+0
| * | pulled spanish translations againiNPUTmice2015-02-011-2/+2
| |/
| * pulled translations from transifexiNPUTmice2015-02-0116-0/+1513
| * Removes some unused strings (the legacy SSL stuff)Sam Whited2015-02-014-7/+0
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-3013-13/+0
| * Use Material Design Icons on API 21+Sam Whited2015-01-29142-17/+80
| * updated translationsiNPUTmice2015-01-254-432/+476
| * Czech translationJaroslav Lichtblau2015-01-251-0/+1
| * show checkbox to hide offline contactsiNPUTmice2015-01-212-0/+9
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-212-12/+7
| * Add block/unblock to contact details menuSam Whited2015-01-211-0/+13
| * Fixed action bar search for Android 5.0iNPUTmice2015-01-201-4/+4
| * Czech translation updatedJaroslav Lichtblau2015-01-191-406/+420
| * Remove legacy SSL supportSam Whited2015-01-1910-15/+0
| * fetched translations from transifexiNPUTmice2015-01-1914-4159/+4412
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+2
| * explain read markeriNPUTmice2015-01-181-0/+13
| * use same helper methods for images and filesiNPUTmice2015-01-181-7/+3
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+2
| |\
| | * Added new file type names for file transfersChristian S2015-01-181-0/+2