aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #840 from kriztan/patch-1Daniel Gultsch2015-01-051-16/+16
|\
| * corrected German spellingsChristian Schneppe2015-01-051-16/+16
|/
* prevent QR code parser from crashing fixed #839Daniel Gultsch2015-01-051-6/+13
* Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...Daniel Gultsch2015-01-054-78/+130
* Merge pull request #838 from shtrom/pebble-notifications-squashDaniel Gultsch2015-01-051-2/+28
|\
| * Send notification to Pebble on new messageOlivier Mehani2015-01-051-2/+28
* | Merge pull request #836 from kriztan/developmentDaniel Gultsch2015-01-0514-416/+437
|\ \ | |/ |/|
| * Updated languages for higher auto accept file sizes and changed labeling to M...Christian Schneppe2015-01-0514-416/+437
|/
* made checks for valid image extensions case insensitiveDaniel Gultsch2015-01-043-3/+3
* do not run mam queries in findOrCreateConversation() when isn't availableDaniel Gultsch2015-01-041-5/+7
* added higher auto accept file sizesDaniel Gultsch2015-01-042-35/+39
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...Daniel Gultsch2015-01-041-0/+7
|\
| * Merge pull request #833 from SamWhited/travisDaniel Gultsch2015-01-041-0/+7
| |\
| | * Add travis configSam Whited2015-01-041-0/+7
| |/
* / added travis build icon to READMEDaniel Gultsch2015-01-041-0/+3
|/
* code cleanup + logging of spoofed iq packetsDaniel Gultsch2015-01-041-35/+33
* Merge pull request #823 from SamWhited/issue20Daniel Gultsch2015-01-0410-116/+123
|\
| * Verify IQ responsesSam Whited2015-01-044-18/+39
| * Make IqPacket type an enumSam Whited2015-01-049-99/+85
|/
* Merge pull request #832 from svetlemodry/developmentDaniel Gultsch2015-01-041-1/+39
|\
| * Czech translation updateJaroslav Lichtblau2015-01-041-1/+39
* | deal with prosodys muc namespace tagging of messagesDaniel Gultsch2015-01-041-4/+5
* | Use packet callbacks only for IqPackets. Removed unnecessary codeDaniel Gultsch2015-01-042-71/+37
|/
* Merge pull request #829 from kriztan/patch-1Daniel Gultsch2015-01-041-1/+1
|\
| * corrected German 'private_message_to'kriztan2015-01-041-1/+1
* | Merge pull request #830 from kruks23/translation4Daniel Gultsch2015-01-041-1/+15
|\ \ | |/ |/|
| * Update spanish translationssergio2015-01-041-1/+15
|/
* no longer use ConcurrentHashMap in favor of synchronize on a final HashMapDaniel Gultsch2015-01-041-19/+27
* Merge branch 'development'0.10Daniel 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
|\