aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #843 from svetlemodry/developmentDaniel Gultsch2015-01-061-0/+5
|\ | | | | Czech translation for - show affiliation instead of role in MucDetails
| * Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
|/
* fixed bug in new ping strategyDaniel Gultsch2015-01-061-3/+3
|
* mark sent images as sent_received instead of sentDaniel Gultsch2015-01-061-2/+1
| | | | fixed #842
* Merge pull request #841 from BenoitBouvarel/patch-2Daniel Gultsch2015-01-061-1/+86
|\ | | | | Update strings.xml
| * Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| | | | | | char ">" was missing at line 285
| * Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| | | | | | French translation updated
* | run invalidateOptionsMenu on uiThreadDaniel Gultsch2015-01-061-1/+1
| |
* | fixed potential NPEs in ShareWithActivityDaniel Gultsch2015-01-061-4/+5
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-051-16/+16
|\ | | | | | | development
| * Merge pull request #840 from kriztan/patch-1Daniel Gultsch2015-01-051-16/+16
| |\ | | | | | | corrected German spellings
| | * corrected German spellingsChristian Schneppe2015-01-051-16/+16
| |/ | | | | and shorten some strings
* | added debug info + possible platform bug work arounds to message adapterDaniel Gultsch2015-01-051-0/+10
| |
* | reworked ping scheduling strategy. very experimentalDaniel Gultsch2015-01-051-61/+32
| |
* | avoid requesting blocklist after stream resumptionDaniel Gultsch2015-01-052-27/+24
|/
* 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 ↵Daniel Gultsch2015-01-054-78/+130
| | | | display role
* Merge pull request #838 from shtrom/pebble-notifications-squashDaniel Gultsch2015-01-051-2/+28
|\ | | | | Send notification to Pebble on new message
| * Send notification to Pebble on new messageOlivier Mehani2015-01-051-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | This implements basic notifications to the Pebble through the app (using an intent). This simply hooks into NotificationService.notify(). This is pretty basic, but it works (I haven't tested to see how the intent is received when the Pebble app is not around, though). More fancy stuff could probably be added to avoid getting flooded, but the Pebble app already does a good job a filtering notification (e.g., screen on or quiet times). Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | Merge pull request #836 from kriztan/developmentDaniel Gultsch2015-01-0514-416/+437
|\ \ | |/ |/| Updated languages ...
| * Updated languages for higher auto accept file sizes and changed labeling to ↵Christian Schneppe2015-01-0514-416/+437
|/ | | | MiB and KiB
* 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
| | | | also changed labeling to MiB and KiB
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-041-0/+7
|\ | | | | | | development
| * Merge pull request #833 from SamWhited/travisDaniel Gultsch2015-01-041-0/+7
| |\ | | | | | | Add travis config
| | * 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 responses
| * Verify IQ responsesSam Whited2015-01-044-18/+39
| | | | | | | | | | | | Fixes #20 Move fromServer/toServer to AbstractStanza
| * Make IqPacket type an enumSam Whited2015-01-049-99/+85
|/
* Merge pull request #832 from svetlemodry/developmentDaniel Gultsch2015-01-041-1/+39
|\ | | | | Czech translation update
| * 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'
| * corrected German 'private_message_to'kriztan2015-01-041-1/+1
| |
* | Merge pull request #830 from kruks23/translation4Daniel Gultsch2015-01-041-1/+15
|\ \ | |/ |/| Update spanish translations
| * 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 translations
| | * 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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 14:41:32 +0000