iNPUTmice
|
7d4e03cc9a
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-04 22:56:36 +01:00 |
|
|
Daniel Gultsch
|
39183418ab
|
Merge pull request #616 from SamWhited/license-compliance
License compliance via an "about" menu item
|
2014-11-04 22:56:33 +01:00 |
|
|
Sam Whited
|
df786cbf01
|
Shorten license text and fix height of scrollview
|
2014-11-04 13:26:48 -05:00 |
|
|
Sam Whited
|
7b67f1a19c
|
Use normal text size and color
|
2014-11-04 13:17:15 -05:00 |
|
|
Sam Whited
|
55c81eaf15
|
Make links clickable in about text
|
2014-11-04 13:09:56 -05:00 |
|
|
iNPUTmice
|
88c0793694
|
link to account details when touching own avatar
|
2014-11-04 18:52:29 +01:00 |
|
|
Sam Whited
|
f10dd428ba
|
Convert about dialog to activity
|
2014-11-04 12:48:46 -05:00 |
|
|
Sam Whited
|
97b4b012d0
|
Use real copyright symbol ©
|
2014-11-04 12:48:25 -05:00 |
|
|
Sam Whited
|
8bf40308c8
|
Move AboutDialog to correct path
|
2014-11-04 12:47:58 -05:00 |
|
|
Sam Whited
|
df54ee75b4
|
Add about dialog with license info
|
2014-11-04 12:47:58 -05:00 |
|
|
iNPUTmice
|
ff10b094a0
|
clear avatar cache after nick name change
|
2014-11-04 18:27:20 +01:00 |
|
|
Daniel Gultsch
|
ff22f93185
|
Merge pull request #625 from SamWhited/linterfix
Make linter ignore properly checked API mismatch
|
2014-11-04 17:59:26 +01:00 |
|
|
Sam Whited
|
b234b690c9
|
Make linter ignore properly checked API mismatch
|
2014-11-04 11:52:47 -05:00 |
|
|
iNPUTmice
|
cd5a56e8e7
|
show avatar in editaccount
|
2014-11-04 17:38:41 +01:00 |
|
|
iNPUTmice
|
b824e55277
|
register nfc callback in every activity that provides a proper sharable uri
|
2014-11-04 17:10:35 +01:00 |
|
|
Daniel Gultsch
|
11ecf43da7
|
Merge pull request #622 from emdete/p1
P1
|
2014-11-04 17:02:46 +01:00 |
|
|
M. Dietrich
|
2ce95b19a9
|
optimize code abit
|
2014-11-04 13:32:44 +01:00 |
|
|
M. Dietrich
|
b6c20d9260
|
implement "correct" ndef parsing
|
2014-11-04 13:32:37 +01:00 |
|
|
iNPUTmice
|
b3582c970e
|
made qr code available from muc and contact details as well
|
2014-11-04 12:15:14 +01:00 |
|
|
iNPUTmice
|
12e2f0bdd7
|
added missing return statement. fixed api bug
|
2014-11-04 11:04:05 +01:00 |
|
|
Daniel Gultsch
|
17070d972e
|
Merge pull request #620 from emdete/p0
P0
|
2014-11-04 10:50:19 +01:00 |
|
|
M. Dietrich
|
fb24bf98c9
|
be more OO
|
2014-11-04 10:49:10 +01:00 |
|
|
M. Dietrich
|
32396b3bde
|
support pre JELLY_BEAN ndef
|
2014-11-04 10:48:59 +01:00 |
|
|
iNPUTmice
|
7a9327d960
|
fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete
|
2014-11-03 23:47:49 +01:00 |
|
|
iNPUTmice
|
d458919c8f
|
unfinishd qr code implemenation. thanks to @emdete
|
2014-11-03 22:47:07 +01:00 |
|
|
iNPUTmice
|
08cb23a886
|
fixed merge error
|
2014-11-03 21:22:26 +01:00 |
|
|
iNPUTmice
|
7d7be8efd8
|
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
Conflicts:
src/main/AndroidManifest.xml
|
2014-11-03 21:07:24 +01:00 |
|
|
iNPUTmice
|
a054a3fbb4
|
use different filter for nfc intents
|
2014-11-03 21:04:22 +01:00 |
|
|
iNPUTmice
|
28a186cd6c
|
basic beam code / untested
|
2014-11-03 20:55:46 +01:00 |
|
|
iNPUTmice
|
4614ff343e
|
create file explicitly before downloading image
|
2014-11-03 20:55:31 +01:00 |
|
|
Daniel Gultsch
|
962008fec8
|
Merge pull request #614 from SamWhited/spacefixes
Fix some space/tab issues in README
|
2014-11-03 20:30:52 +01:00 |
|
|
iNPUTmice
|
c48407f3b4
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-03 20:28:58 +01:00 |
|
|
iNPUTmice
|
696dd07a41
|
basic beam code / untested
|
2014-11-03 20:00:20 +01:00 |
|
|
iNPUTmice
|
ec9c264cf7
|
more error handling for http connection
|
2014-11-03 19:59:11 +01:00 |
|
|
iNPUTmice
|
21069003b0
|
disabled proguard. fixed gradle libs
|
2014-11-03 19:56:38 +01:00 |
|
|
Daniel Gultsch
|
e496a5409b
|
Merge pull request #615 from SamWhited/issue611
Wrap "last seen" time
|
2014-11-03 14:30:15 +01:00 |
|
|
Sam Whited
|
39ae34d3e6
|
Wrap "last seen" time.
Fixes #611
|
2014-11-03 08:28:20 -05:00 |
|
|
Sam Whited
|
515f2f379f
|
Removed the last \t from the README...
|
2014-11-03 08:08:51 -05:00 |
|
|
Sam Whited
|
61466f352f
|
Another tab fix.
|
2014-11-03 08:07:59 -05:00 |
|
|
Sam Whited
|
f3401ab64f
|
Fix some space/tab issues in README
|
2014-11-03 08:06:32 -05:00 |
|
|
Daniel Gultsch
|
b54b1ca3b7
|
Merge pull request #605 from emdete/render_gradle_path
adjust path in render script
|
2014-11-03 13:30:10 +01:00 |
|
|
iNPUTmice
|
3e05ef77b1
|
version bump to 0.8.1
|
2014-11-03 11:20:51 +01:00 |
|
|
iNPUTmice
|
49920649db
|
always use exif helper
|
2014-11-03 11:20:32 +01:00 |
|
|
iNPUTmice
|
27f42dfb63
|
more error handling in xmppconnection
|
2014-11-03 10:03:45 +01:00 |
|
|
M. Dietrich
|
c7d59f1985
|
adjust path in render script
|
2014-11-01 22:44:09 +01:00 |
|
|
iNPUTmice
|
1ea2e7dc3b
|
fixed arrayoutofbounds + spelling
|
2014-11-01 14:33:34 +01:00 |
|
|
Daniel Gultsch
|
a0f694ea44
|
Merge pull request #600 from SamWhited/gradle
Build system and library changes (Gradle / Subtree merging)
|
2014-11-01 13:51:05 +01:00 |
|
|
Sam Whited
|
46f147a82c
|
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
|
2014-10-30 15:33:13 -04:00 |
|
|
iNPUTmice
|
142384e580
|
version bump and changelog
|
2014-10-30 11:55:25 +01:00 |
|
|
iNPUTmice
|
f2c1a80059
|
Merge branch 'development'
|
2014-10-30 11:20:35 +01:00 |
|