aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* modified TODOlookshe2015-02-191-0/+2
* added section to TODOlookshe2015-02-131-0/+1
* some more in TODOlookshe2015-02-131-0/+2
* add TODOlookshe2015-02-071-0/+3
* - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-207-23/+116
* Merge branch 'master' of ssh://git.fucktheforce.de/conversationsTristan Zur2015-01-1111-0/+77
|\
| * changes to get it working under eclipselookshe2015-01-1013-2/+81
* | Setting added for parsing emoticons or notTristan Zur2015-01-115-2/+17
* | Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter fo...Tristan Zur2015-01-102-2/+4
|/
* Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-0399-2659/+4722
|\
| * Merge branch 'development'Daniel Gultsch2015-01-031-5/+11
| |\
| | * Merge pull request #827 from kriztan/patch-2Daniel Gultsch2015-01-031-5/+11
| | |\
| | | * Added and modified German translationskriztan2015-01-031-5/+11
| | |/
| * / version bump to 0.10Daniel Gultsch2015-01-033-3/+13
| |/
| * void messages getting reloaded through mam after clear historyDaniel Gultsch2015-01-031-0/+1
| * record voice and attachment refactorDaniel Gultsch2015-01-035-74/+73
| * disable / enable all accountsDaniel Gultsch2015-01-033-27/+103
| * update last presence only for messagesDaniel Gultsch2015-01-032-6/+2
| * added missing layout fileDaniel Gultsch2015-01-031-0/+105
| * code cleanupDaniel Gultsch2015-01-033-11/+22
| * migrated change password into separate activityDaniel Gultsch2015-01-036-88/+138
| * some further otr improvementsDaniel Gultsch2015-01-026-9/+31
| * click on dynamic tag to filter for that tagDaniel Gultsch2015-01-022-0/+34
| * Merge remote-tracking branch 'origin/development' into developmentDaniel Gultsch2015-01-021-0/+7
| |\
| | * Merge pull request #826 from kriztan/patch-1Daniel Gultsch2015-01-021-0/+7
| | |\
| | | * Added German translationskriztan2015-01-021-0/+7
| * | | allow cancellation of waiting filesDaniel Gultsch2015-01-022-19/+23
| |/ /
| * / put Conversations into background mode earlierDaniel Gultsch2015-01-025-19/+44
| |/
| * prefer PLAIN over DIGEST-MD5Daniel Gultsch2015-01-022-3/+3
| * fixed layout fileDaniel Gultsch2015-01-021-1/+1
| * improved OTR verification part oneDaniel Gultsch2015-01-0212-352/+403
| * Merge remote-tracking branch 'origin/development' into developmentDaniel Gultsch2014-12-3015-22/+8
| |\
| | * Merge pull request #821 from SamWhited/appnametranslationDaniel Gultsch2014-12-3015-22/+8
| | |\
| | | * Make `app_name' string untranslatableSam Whited2014-12-2915-22/+8
| | |/
| * / improved fromServer filterDaniel Gultsch2014-12-301-1/+4
| |/
| * refactor swithOverToTls stuffDaniel Gultsch2014-12-301-56/+45
| * fixed npe in block menu itemDaniel Gultsch2014-12-301-1/+1
| * fixed nl stringsDaniel Gultsch2014-12-301-25/+1
| * fixed #818Daniel Gultsch2014-12-301-1/+1
| * Merge pull request #812 from kriztan/patch-1Daniel Gultsch2014-12-301-0/+4
| |\
| | * Update german translationskriztan2014-12-271-0/+4
| * | Merge pull request #813 from plsng/translationDaniel Gultsch2014-12-302-114/+292
| |\ \
| | * | Update Dutch translationsNathan Follens2014-12-292-10/+10
| | * | Update Dutch translationsNathan Follens2014-12-272-113/+291
| | |/
| * | Merge pull request #814 from kruks23/translation1Daniel Gultsch2014-12-301-3/+27
| |\ \
| | * | Update spanish translationssergio2014-12-271-3/+27
| | |/
| * | Merge pull request #819 from SamWhited/spellingDaniel Gultsch2014-12-307-58/+58
| |\ \ | | |/ | |/|
| | * Fix typo in method nameSam Whited2014-12-295-9/+9
| | * Rename observations doc fileSam Whited2014-12-291-0/+0
| | * Fix spelling in the docsSam Whited2014-12-282-49/+49
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 02:37:12 +0000