aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Update spanish translationskruks232014-12-011-9/+11
* | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-021-23/+97
|\ \ | |/ |/|
| * pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| * Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
* | fixed italian translationiNPUTmice2014-12-011-5/+5
* | Removed pref_about_message which is not translatableElinvention2014-11-301-24/+0
* | Added missing italian translations with some minor fixes to existing onesElinvention2014-11-302-10/+113
|/
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-293-3/+8
|\
| * Accessibility: Add missing image descriptionsSam Whited2014-11-293-3/+8
* | Update basque translationAitor Beriain2014-11-271-0/+6
|/
* Update german translationskriztan2014-11-261-1/+1
* Merge pull request #714 from betheg/muc_bookmark_cdDaniel Gultsch2014-11-241-0/+10
|\
| * MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+10
* | Update german translationskriztan2014-11-231-0/+2
|/
* Update spanish translationskruks232014-11-221-2/+8
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-0/+2
* Update german translationskriztan2014-11-201-16/+20
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-0/+4
* Merge pull request #691 from kruks23/developmentDaniel Gultsch2014-11-191-5/+11
|\
| * Update spanish translationskruks232014-11-191-4/+4
| * Update spanish translationskruks232014-11-181-2/+8
* | Merge pull request #692 from kriztan/patch-3Daniel Gultsch2014-11-191-0/+41
|\ \
| * | Update german translationskriztan2014-11-191-0/+41
| |/
* / Update basque translationAitor Beriain2014-11-191-0/+56
|/
* put error notification into notification serviceiNPUTmice2014-11-184-0/+0
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
* properly remove conversations context menuiNPUTmice2014-11-182-11/+7
* added rendered versions of new iconsiNPUTmice2014-11-188-0/+0
* context menu for conversations. fixed #630iNPUTmice2014-11-182-0/+12
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-171-1/+4
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-0/+4
* Merge pull request #680 from ferdev1/patch-2Daniel Gultsch2014-11-171-2/+2
|\
| * Update strings.xmlferdev12014-11-171-2/+2
* | slightly modified logo / launcher iconiNPUTmice2014-11-178-0/+0
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-171-1/+1
|\
| * Fix stringferdev12014-11-161-1/+1
* | highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-171-1/+1
|/
* happy hanukkahiNPUTmice2014-11-165-1/+30
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-163-5/+28
* Update Spanish Translationskruks232014-11-151-3/+38
* Add incompatible server statusSam Whited2014-11-151-0/+1
* Add security error statusSam Whited2014-11-151-0/+1
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-153-3/+17
|\
| * handled more error casesiNPUTmice2014-11-151-0/+1
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-151-0/+2
| * made file transfers cancelableiNPUTmice2014-11-152-1/+5
| * adepted conversationadapter to deal with filesiNPUTmice2014-11-151-0/+2
| * some mime and pgp fixes for file transferiNPUTmice2014-11-151-0/+1
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-1/+2
| * basic arbitrary file transferiNPUTmice2014-11-152-3/+6