aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed invitesDaniel Gultsch2015-01-071-37/+24
* Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-074-4/+20
|\
| * Update travis config to use current build toolsSam Whited2015-01-061-1/+2
| * Add materials themeSam Whited2015-01-063-3/+18
* | basic affiliation changes in mucDaniel Gultsch2015-01-076-26/+160
* | reset next encryption when archiving conversationsDaniel Gultsch2015-01-072-1/+3
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...Daniel Gultsch2015-01-072-0/+10
|\ \
| * \ Merge pull request #846 from kruks23/translation4Daniel Gultsch2015-01-071-0/+5
| |\ \ | | |/ | |/|
| | * Update affiliation in MUC details and advance modekruks232015-01-071-0/+5
| * | Merge pull request #843 from svetlemodry/developmentDaniel Gultsch2015-01-061-0/+5
| |\ \
| | * | Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
| |/ /
* | | use copyonwritearraylist in for phone helperDaniel Gultsch2015-01-071-2/+2
* | | refactored UiHelperDaniel Gultsch2015-01-071-2/+10
|/ /
* | 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
* | Merge pull request #841 from BenoitBouvarel/patch-2Daniel Gultsch2015-01-061-1/+86
|\ \
| * | Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| * | Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
* | | 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 dev...Daniel Gultsch2015-01-051-16/+16
|\ \
| * \ Merge pull request #840 from kriztan/patch-1Daniel Gultsch2015-01-051-16/+16
| |\ \
| | * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| |/ /
* | | 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 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
|\ \ \ | |/ / |/| / | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:01:45 +0000