aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-208-42/+33
|\
| * Merge pull request #128 from kruks23/developmentDaniel Gultsch2014-05-201-3/+8
| |\
| * | highlight people in conferences by clicken on their pictureDaniel Gultsch2014-05-201-14/+27
| * | fixed ping time out after session resumeDaniel Gultsch2014-05-201-0/+1
| * | ported pending subscription support to new roster mgmtDaniel Gultsch2014-05-203-28/+5
| * | added search iconDaniel Gultsch2014-05-204-0/+0
* | | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-193-41/+30
|\| |
| * | made roster persistant aka enabled versioning againDaniel Gultsch2014-05-193-41/+30
* | | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-1917-642/+385
|\| | | |/ |/|
| * some code cleanup to deal with the roster mgmt changes from earlierDaniel Gultsch2014-05-193-77/+54
| * reworked roster/contact handling. might break some stuff. not sycing to disk yetDaniel Gultsch2014-05-1916-566/+332
* | Update Spanish Translationskruks232014-05-181-3/+8
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-1810-83/+92
|\|
| * bind and session request more compatibleDaniel Gultsch2014-05-184-5/+21
| * fixed #123 fixed122Daniel Gultsch2014-05-183-31/+11
| * cleaned up edit account dialog a littleDaniel Gultsch2014-05-183-20/+21
| * fixed #53 aka server not found bugDaniel Gultsch2014-05-183-27/+39
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-173-9/+13
|\|
| * sending session after unsucesfull session resume. fixed #116Daniel Gultsch2014-05-171-7/+8
| * Merge branch 'master' into developmentDaniel Gultsch2014-05-172-2/+5
| |\
| | * bumped version 0.2.30.2.3Daniel Gultsch2014-05-172-2/+5
| | * receiving pgp images important bug fixDaniel Gultsch2014-05-171-1/+1
* | | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-05-177-4/+22
|\| |
| * | added record audio buttonDaniel Gultsch2014-05-174-1/+13
| * | made sending session more compliantDaniel Gultsch2014-05-171-2/+2
| * | receiving pgp images important bug fixDaniel Gultsch2014-05-171-1/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2014-05-171-0/+6
| |\|
| | * updated changelog for version 0.2.2Daniel Gultsch2014-05-171-0/+6
* | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 21:59:32 +0000