Commit log

df786cb Shorten license text and fix height of scrollview

Sam Whited created

7b67f1a Use normal text size and color

Sam Whited created

55c81ea Make links clickable in about text

Sam Whited created

88c0793 link to account details when touching own avatar

iNPUTmice created

f10dd42 Convert about dialog to activity

Sam Whited created

97b4b01 Use real copyright symbol ©

Sam Whited created

8bf4030 Move AboutDialog to correct path

Sam Whited created

df54ee7 Add about dialog with license info

Sam Whited created

ff10b09 clear avatar cache after nick name change

iNPUTmice created

ff22f93 Merge pull request #625 from SamWhited/linterfix

Click to expand commit body
Make linter ignore properly checked API mismatch

Daniel Gultsch created

b234b69 Make linter ignore properly checked API mismatch

Sam Whited created

cd5a56e show avatar in editaccount

iNPUTmice created

b824e55 register nfc callback in every activity that provides a proper sharable uri

iNPUTmice created

11ecf43 Merge pull request #622 from emdete/p1

Click to expand commit body
P1

Daniel Gultsch created

2ce95b1 optimize code abit

M. Dietrich created

b6c20d9 implement "correct" ndef parsing

M. Dietrich created

b3582c9 made qr code available from muc and contact details as well

iNPUTmice created

12e2f0b added missing return statement. fixed api bug

iNPUTmice created

17070d9 Merge pull request #620 from emdete/p0

Click to expand commit body
P0

Daniel Gultsch created

fb24bf9 be more OO

M. Dietrich created

32396b3 support pre JELLY_BEAN ndef

M. Dietrich created

7a9327d fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete

iNPUTmice created

d458919 unfinishd qr code implemenation. thanks to @emdete

iNPUTmice created

08cb23a fixed merge error

iNPUTmice created

7d7be8e Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc

Click to expand commit body
Conflicts:
	src/main/AndroidManifest.xml

iNPUTmice created

a054a3f use different filter for nfc intents

iNPUTmice created

28a186c basic beam code / untested

iNPUTmice created

4614ff3 create file explicitly before downloading image

iNPUTmice created

962008f Merge pull request #614 from SamWhited/spacefixes

Click to expand commit body
Fix some space/tab issues in README

Daniel Gultsch created

c48407f Merge branch 'development' of https://github.com/siacs/Conversations into development

iNPUTmice created

696dd07 basic beam code / untested

iNPUTmice created

ec9c264 more error handling for http connection

iNPUTmice created

2106900 disabled proguard. fixed gradle libs

iNPUTmice created

e496a54 Merge pull request #615 from SamWhited/issue611

Click to expand commit body
Wrap "last seen" time

Daniel Gultsch created

39ae34d Wrap "last seen" time.

Click to expand commit body
Fixes #611

Sam Whited created

515f2f3 Removed the last \t from the README...

Sam Whited created

61466f3 Another tab fix.

Sam Whited created

f3401ab Fix some space/tab issues in README

Sam Whited created

b54b1ca Merge pull request #605 from emdete/render_gradle_path

Click to expand commit body
adjust path in render script

Daniel Gultsch created

3e05ef7 version bump to 0.8.1

iNPUTmice created

4992064 always use exif helper

iNPUTmice created

27f42df more error handling in xmppconnection

iNPUTmice created

c7d59f1 adjust path in render script

M. Dietrich created

1ea2e7d fixed arrayoutofbounds + spelling

iNPUTmice created

a0f694e Merge pull request #600 from SamWhited/gradle

Click to expand commit body
Build system and library changes (Gradle / Subtree merging)

Daniel Gultsch created

46f147a Merge branch 'gradle' into development

Click to expand commit body
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

Sam Whited created

142384e version bump and changelog

iNPUTmice created

f2c1a80 Merge branch 'development'

iNPUTmice created

7b4f363 only end otr session if there is more than one contact presence. reset otherwise

iNPUTmice created

e4567e7 cleanup for clear conversation history. small otr fixes

iNPUTmice created