aboutsummaryrefslogtreecommitdiffstats
path: root/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* unified crypto messages and made lock icon work for conferencesiNPUTmice2014-06-011-2/+1
* added warning when public keys are missingiNPUTmice2014-06-011-0/+1
* show dialog when no contact in a muc has pgp supportiNPUTmice2014-06-011-0/+2
* OpenPGP key display in muc details is now prettier and linked to openkeychainiNPUTmice2014-06-011-0/+9
* Capitalized openPGP -> OpenPGPAlethea Butler2014-05-317-39/+39
* Merge pull request #160 from alethea/developmentDaniel Gultsch2014-05-301-2/+2
|\
| * Changed "unsuccessful delivery" to "delivery failed"Alethea Butler2014-05-301-1/+1
| * Added question mark to remove_contact_textAlethea Butler2014-05-301-1/+1
* | More harcoded translations + updated Spanishkruks232014-05-294-14/+47
|/
* Merge pull request #147 from kruks23/developmentDaniel Gultsch2014-05-261-2/+2
|\
| * Fix Contact Status width in contact detailskruks232014-05-241-2/+2
* | Merge pull request #152 from beriain/developmentDaniel Gultsch2014-05-261-2/+48
|\ \
| * | Update strings.xmlAitor Beriain2014-05-261-13/+13
| * | Update strings.xmlAitor Beriain2014-05-261-2/+48
* | | fixed #151iNPUTmice2014-05-265-2/+126
| |/ |/|
* | error msg on offline subscription changesDaniel Gultsch2014-05-241-0/+1
* | More harcoded translations + Spanishkruks232014-05-245-17/+47
* | Title activities translations + contacts translations + update Spanish Transl...kruks232014-05-232-2/+30
* | Merge pull request #143 from nachovfranco/mycommitsDaniel Gultsch2014-05-232-0/+195
|\ \
| * | Galician translationnachovfranco2014-05-222-0/+195
* | | Contact details translations + update spanish translationskruks232014-05-222-1/+28
|/ /
* | added missing stringsDaniel Gultsch2014-05-211-1/+1
* | Merge pull request #131 from beriain/developmentDaniel Gultsch2014-05-201-80/+121
|\|
| * Update and fix basque translationBeriain2014-05-201-80/+121
* | Update Spanish Translations + harcoded just_nowkruks232014-05-202-6/+10
* | Merge pull request #128 from kruks23/developmentDaniel Gultsch2014-05-201-3/+8
|\ \
| * | Update Spanish Translationskruks232014-05-181-3/+8
* | | added search iconDaniel Gultsch2014-05-204-0/+0
* | | reworked roster/contact handling. might break some stuff. not sycing to disk yetDaniel Gultsch2014-05-191-6/+0
|/ /
* | bind and session request more compatibleDaniel Gultsch2014-05-181-1/+2
* | cleaned up edit account dialog a littleDaniel Gultsch2014-05-182-0/+8
* | added record audio buttonDaniel Gultsch2014-05-173-1/+5
* | fixed #66Daniel Gultsch2014-05-172-4/+1
* | spellingDaniel Gultsch2014-05-171-1/+1
* | Update Spanish Translations + harcoded pref_advanced_settingskruks232014-05-162-1/+33
* | updated german translationDaniel Gultsch2014-05-162-34/+71
* | formatingDaniel Gultsch2014-05-162-2/+2
* | French translation + hard-coded string > @stringBenoit Bouvarel2014-05-167-21/+128
* | Merge pull request #109 from kruks23/developmentDaniel Gultsch2014-05-151-3/+14
|\ \
| * | Update Spanish Translationskruks232014-05-141-3/+14
* | | fixed #105Daniel Gultsch2014-05-141-0/+5
|/ /
* | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-142-1/+2
|\ \
| * | one more entry to strings fileDaniel Gultsch2014-05-132-1/+2
| |/
* | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-71/+116
|\|
| * FixBeriain2014-05-131-79/+79
| * Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-1310-18/+364
| |\
| * | Update basque translation and include preferencesBeriain2014-05-131-0/+8
| * | Update basque translationBeriain2014-05-121-0/+34
| * | Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-126-60/+111
| |\ \
| * | | Update basque translationBeriain2014-05-081-0/+3