Ernir Erlingsson c12c60d000 Merge branch '356-make-it-clearer-who-will-be-introduced' into 'master' ...

Make it clearer who will be introduced

Show contact names under avatars before sending introduction to make it clearer who will be introduced.

![device-2016-07-08-121836](/uploads/de13f6e75b9a573e561e9c810bbdb08b/device-2016-07-08-121836.png)

Closes #356

See merge request !242

2016-07-13 18:47:09 +00:00

..

.tx

Make use of Existing Translations

2016-06-27 11:31:42 -03:00

artwork

New Trust Level Indicator Replaces The Stars

2016-06-15 12:41:43 -03:00

assets

Removed Tor binaries from repo. #203

2016-04-18 12:50:34 +01:00

libs

Updated jtorctl binary with new patch.

2016-05-06 12:03:39 +01:00

res

Merge branch '356-make-it-clearer-who-will-be-introduced' into 'master'

2016-07-13 18:47:09 +00:00

src

Merge branch '356-make-it-clearer-who-will-be-introduced' into 'master'

2016-07-13 18:47:09 +00:00

test/java

Fix test broken by #78

2016-06-17 04:48:13 +00:00

.gitignore

Removed Tor binaries from repo. #203

2016-04-18 12:50:34 +01:00

AndroidManifest.xml

Merge branch '461-forum-invitation-can-not-be-accepted-if-forum-already-added' into 'master'

2016-07-12 23:34:22 +00:00

build.gradle

Upgraded Gradle to 2.13, added local Maven repo.

2016-05-12 13:36:34 +01:00

proguard-rules.txt

modifications based on Akwizgran's comments

2016-05-11 11:55:17 +02:00

project.properties

tweaked proguard

2016-02-02 12:21:08 +01:00