aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-1710-32/+25
|\
| * Update Validator.javathe-username2014-05-171-1/+1
| * fixed #66Daniel Gultsch2014-05-172-4/+1
| * spellingDaniel Gultsch2014-05-171-1/+1
| * fixed #108Daniel Gultsch2014-05-171-3/+4
| * added translators to readmeDaniel Gultsch2014-05-171-3/+6
| * version bump to 0.2.20.2.2Daniel Gultsch2014-05-171-2/+2
| * permanent notification disapears now when account is being deleted + code cle...Daniel Gultsch2014-05-173-16/+9
| * fixed #113Daniel Gultsch2014-05-171-2/+1
| * Merge pull request #120 from kruks23/developmentDaniel Gultsch2014-05-162-1/+33
| |\
* | | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-163-20/+27
|\| | | |/ |/|
| * reworked message to conferencesDaniel Gultsch2014-05-162-16/+19
| * fixed npe for otr sessions with non contactsDaniel Gultsch2014-05-161-4/+8
* | Update Spanish Translations + harcoded pref_advanced_settingskruks232014-05-162-1/+33
|/
* updated german translationDaniel Gultsch2014-05-162-34/+71
* offline sending of pgp fixedDaniel Gultsch2014-05-162-25/+43
* formatingDaniel Gultsch2014-05-162-2/+2
* fixed null in shared linkDaniel Gultsch2014-05-161-1/+5
* Merge pull request #117 from BenoitBouvarel/developmentDaniel Gultsch2014-05-168-37/+144
|\
| * French translation + hard-coded string > @stringBenoit Bouvarel2014-05-168-37/+144
|/
* Merge pull request #109 from kruks23/developmentDaniel Gultsch2014-05-151-3/+14
|\
| * Update Spanish Translationskruks232014-05-141-3/+14
* | fixed npeDaniel Gultsch2014-05-151-5/+3
* | hiding the prepare image toast after error or successDaniel Gultsch2014-05-142-3/+15
* | fixed possible npeDaniel Gultsch2014-05-141-4/+3
* | fixed #105Daniel Gultsch2014-05-143-29/+43
|/
* made message parser non staticDaniel Gultsch2014-05-142-64/+86
* code clean upDaniel Gultsch2014-05-141-104/+51
* Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-144-3/+8
|\
| * one more entry to strings fileDaniel Gultsch2014-05-132-1/+2
| * version bump0.2.1Daniel Gultsch2014-05-132-2/+6
* | added presence selectionDaniel Gultsch2014-05-131-5/+19
* | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-71/+116
|\|
| * Merge branch 'beriain-development' into developmentDaniel Gultsch2014-05-131-71/+116
| |\
| | * Merge branch 'development' of https://github.com/beriain/Conversations into b...Daniel Gultsch2014-05-131-71/+116
| |/|
| | * FixBeriain2014-05-131-79/+79
| | * Merge https://github.com/siacs/Conversations into developmentBeriain2014-05-1314-44/+416
| | |\
| | * | 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-1221-265/+439
| | |\ \
| | * | | Update basque translationBeriain2014-05-081-0/+3
* | | | | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-131-10/+12
|\| | | |
| * | | | code cleanupDaniel Gultsch2014-05-131-10/+12
* | | | | takeing pictures over intentDaniel Gultsch2014-05-133-42/+95
* | | | | Merge branch 'development' into feature/take_pictureDaniel Gultsch2014-05-132-8/+10
|\| | | |
| * | | | static method for providing content uriDaniel Gultsch2014-05-132-8/+10
| | |_|/ | |/| |
* / | | submenu for attach fileDaniel Gultsch2014-05-133-1/+42
|/ / /
* | | ensure that iq response is being send out for jingle packets. remove jingle c...Daniel Gultsch2014-05-132-22/+44
* | | german translationDaniel Gultsch2014-05-131-1/+1
* | | further translationsDaniel Gultsch2014-05-135-17/+67
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 21:37:54 +0000