Commit log

f1494f8 fixed pgp signature creation

iNPUTmice created

5ae62f1 fixed pgp signature creation

iNPUTmice created

1a09a47 added ability to disable notifications for specific conversations - fixed #322

iNPUTmice created

1f378bf made emoticon parsing enableable - default false

iNPUTmice created

c1453db Merge branch 'betheg-unused_resources' into development

iNPUTmice created

3235c67 Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources

iNPUTmice created

9dd1513 Update README

Dominik Schürmann created

bba03f2 Update README

Dominik Schürmann created

3bcf726 Update README

Dominik Schürmann created

97b52ab fixed #410 by removing that config option

iNPUTmice created

0ae852a refactored share with activity

iNPUTmice created

567827f fixed #406

iNPUTmice created

c629370 rotate avatars

Click to expand commit body
Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java

iNPUTmice created

2c9b2e6 fixed #406

iNPUTmice created

f888b16 rotate avatars

iNPUTmice created

6045bcc Merge pull request #408 from emdete/unicode_emoticons

Click to expand commit body
add all whitespaces in regex

Daniel Gultsch created

a7b3aa3 add all whitespaces in regex

M. Dietrich created

6291ebf Merge pull request #380 from emdete/unicode_emoticons

Click to expand commit body
add translation from ascii to unicode emoticons

Daniel Gultsch created

5460821 transform ascii to emoticons (on display only)

M. Dietrich created

8f0882e removed unused string resources.

Michael created

d42ea45 fixed #403

iNPUTmice created

a788175 fixed #403

iNPUTmice created

0ffdb03 Merge pull request #402 from emdete/remove_poormans_tostring

Click to expand commit body
optimize string operations a bit

Daniel Gultsch created

2acf510 optimize string operations a bit

M. Dietrich created

8b36d28 Changelog

Dominik Schürmann created

575b9d2 Add userIds to OpenPgpSignatureResult

Dominik Schürmann created

eda2470 Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib

Dominik Schürmann created

e0be0f6 Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN

Dominik Schürmann created

271b0f9 updated readme

iNPUTmice created

5b24534 Contact presenceName property

Gayaz Yusipov created

3558fa5 deleted unnecessary log

iNPUTmice created

e30599b Merge pull request #401 from jelmer/dutch-updates

Click to expand commit body
Update Dutch translations.

Daniel Gultsch created

86b8506 Update Dutch translations.

Jelmer Vernooij created

94389ac show merged time and status in message adapter

iNPUTmice created

bda7724 improvements for merge conditions

iNPUTmice created

28fa487 add missing blank before nick

iNPUTmice created

4793081 Merge pull request #400 from xsrc/development

Click to expand commit body
Smarter nickname highlight insert in confernces

Daniel Gultsch created

3e3451b Smarter nickname highlight insert in confernces

Bahtiar `kalkin-` Gadimov created

1ac5be4 some code cleanup

iNPUTmice created

8d45608 Merge pull request #391 from betheg/fix_typo

Click to expand commit body
fix forgotten spelling.

Daniel Gultsch created

5ab025d Merge pull request #398 from betheg/fix_res

Click to expand commit body
fix: warning: string 'publish_avatar' has no default translation.

Daniel Gultsch created

1cc1616 require encrypted to be the same for messages to get merged

iNPUTmice created

8f8d4e3 experimental message merging

iNPUTmice created

fb3c754 Merge pull request #1 from Flowdalic/flow

Click to expand commit body
Add my Real-name to the Copyright statement

Dominik Schürmann created

733041a fix: warning: string 'publish_avatar' has no default translation.

Click to expand commit body
also altered the types of resources from array to string-array in some res-files.

Michael created

d15482c Add my Real-name to the Copyright statement

Click to expand commit body
of ParcelFileDescriptorUtil.

Florian Schmaus created

969cba5 Merge remote-tracking branch 'upstream/development' into fix_typo

Michael created

ec62209 XEP-0172

Gayaz Yusipov created

9eafb10 version bump to 0.7-alpha

iNPUTmice created

c494f4f Merge branch 'sm' into development

Click to expand commit body
Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java

iNPUTmice created