aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-156-0/+9
|\ \
| * | turn on foreground service in expert settingsiNPUTmice2014-11-156-0/+9
| |/
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-153-60/+206
|\ \ | |/ |/|
| * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-112-0/+14
| * initial smp supportiNPUTmice2014-11-113-60/+192
* | Merge pull request #666 from SamWhited/localefixesDaniel Gultsch2014-11-152-3/+3
|\ \
| * | Spelling fixes in Italian translationSam Whited2014-11-141-2/+2
| * | Spelling fix in German translationSam Whited2014-11-141-1/+1
* | | Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/ /
* | Update German languagekriztan2014-11-121-24/+0
* | Update German languagekriztan2014-11-121-5/+34
|/
* formatingiNPUTmice2014-11-092-24/+9
* Merge pull request #645 from betheg/about_all_libsDaniel Gultsch2014-11-091-15/+24
|\
| * add libidn to pref_about_message.Michael2014-11-091-0/+1
| * add all used libs to the pref_about_message.Michael2014-11-091-15/+23
* | Update Spanish Translationskruks232014-11-091-1/+21
|/
* reformated license a bitiNPUTmice2014-11-042-22/+16
* Shorten license text and fix height of scrollviewSam Whited2014-11-042-20/+7
* Use normal text size and colorSam Whited2014-11-041-1/+4
* Make links clickable in about textSam Whited2014-11-042-4/+7
* Convert about dialog to activitySam Whited2014-11-045-18/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 07:31:46 +0000