aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-0/+5
|\
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-161-0/+5
* | 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-041-13/+20
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-041-13/+20
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-0/+6
|\|
| * 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-201-0/+5
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-032-1/+19
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-031-0/+4
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-302-1/+15
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-2/+2
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-231-2/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-161-0/+2
|\|
| * Fixes FS#82: Background color of conversation list item set to primary backgr...steckbrief2015-10-161-0/+2
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-0/+25
|\|
| * Publishing additional information in message details dialog such as message t...steckbrief2015-10-041-0/+21
| * Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...steckbrief2015-10-041-0/+4
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-116-150/+190
| |\ | |/ |/|
| * App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-116-150/+190
|/
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-142-3/+16
* added settings for accepting and downloading fileslookshe2015-04-121-1/+7
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-111-1/+3
|\
| * differ between received and read messagelookshe2015-04-111-1/+3
* | Color choose dialogsteckbrief2015-04-112-1/+8
|/
* no trim of messages or passwordlookshe2015-04-111-0/+3
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+14
|\
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-181-0/+4
| * 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-071-0/+3
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+4
| * added actions to error notificationiNPUTmice2015-02-101-0/+1
* | Merge master-originsteckbrief2015-02-206-50/+136
|\|
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-301-1/+0
| * Use Material Design Icons on API 21+Sam Whited2015-01-293-0/+42
| * show checkbox to hide offline contactsiNPUTmice2015-01-211-0/+1
| * Remove legacy SSL supportSam Whited2015-01-191-2/+0
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+2
| * 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
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-0/+1
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-4/+4
| * Add download button on notification if applicableSam Whited2015-01-161-0/+1
| * show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-0/+1
| * added dedicated button to disable foreground service in perma notificationiNPUTmice2015-01-151-1/+2
| * Merge pull request #885 from SamWhited/display-enter-keyDaniel Gultsch2015-01-141-0/+2
| |\
| | * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 15:18:36 +0000