iNPUTmice
|
e30e84c819
|
slightly modified logo / launcher icon
|
2014-11-17 17:23:58 +01:00 |
|
|
ferdev1
|
6c13b8a9a1
|
Update strings.xml
|
2014-11-17 17:13:20 +01:00 |
|
|
Daniel Gultsch
|
c7b8d3648a
|
Merge pull request #679 from SamWhited/lintfix
Fix broken SuppressLint
|
2014-11-17 15:25:58 +01:00 |
|
|
Sam Whited
|
55957a77b3
|
Fix linter suppression
|
2014-11-17 09:19:11 -05:00 |
|
|
iNPUTmice
|
ceecc8ffe7
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-17 01:54:19 +01:00 |
|
|
iNPUTmice
|
967cd922e1
|
highlight muc members by touching their name in muc details. fixed #503
|
2014-11-17 01:54:01 +01:00 |
|
|
Daniel Gultsch
|
81b93c763a
|
Merge pull request #675 from ferdev1/patch-1
Fix string
|
2014-11-17 00:04:53 +01:00 |
|
|
iNPUTmice
|
2036c58cd7
|
made tags searchable
|
2014-11-16 23:58:30 +01:00 |
|
|
iNPUTmice
|
8c4236b01b
|
fixed regression of xmpp uris not working
|
2014-11-16 22:23:42 +01:00 |
|
|
ferdev1
|
c147f44cf1
|
Fix string
|
2014-11-16 18:11:14 +01:00 |
|
|
Daniel Gultsch
|
155b607f4d
|
Merge pull request #673 from SamWhited/development
Fix fetching accounts by JIDs
|
2014-11-16 17:35:59 +01:00 |
|
|
iNPUTmice
|
cf00f3fade
|
happy hanukkah
|
2014-11-16 17:21:21 +01:00 |
|
|
Sam Whited
|
5765a91db6
|
Fix fetching accounts by JIDs
Fixes a crash when publishing an avatar
|
2014-11-16 10:04:45 -05:00 |
|
|
iNPUTmice
|
84b2ce10b7
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-16 12:28:21 +01:00 |
|
|
iNPUTmice
|
d43aeb7218
|
Merge branch 'master' into development
Conflicts:
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
|
2014-11-16 12:27:17 +01:00 |
|
|
iNPUTmice
|
279534ddb4
|
version bump to 0.8.4
|
2014-11-16 12:25:08 +01:00 |
|
|
iNPUTmice
|
ccc3c10066
|
show full time stamp in connection established field
|
2014-11-16 12:11:40 +01:00 |
|
|
iNPUTmice
|
ac8c2b7e62
|
show full time stamp in connection established field
|
2014-11-16 12:11:14 +01:00 |
|
|
iNPUTmice
|
f41f3b120c
|
better error checking in ssl switch over
Conflicts:
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
|
2014-11-16 12:05:57 +01:00 |
|
|
iNPUTmice
|
f18f3086af
|
better error checking in ssl switch over
|
2014-11-16 12:00:53 +01:00 |
|
|
Daniel Gultsch
|
2c65477532
|
Merge pull request #672 from SamWhited/development
Don't escape passwords in SASL
|
2014-11-16 03:13:53 +01:00 |
|
|
Sam Whited
|
cfdda5f8fd
|
Don't escape passwords in SASL
Fixes #671
|
2014-11-15 21:11:14 -05:00 |
|
|
iNPUTmice
|
2067b9bd8d
|
made scan and show qr code more accessible in VerifyOtrActivity
|
2014-11-16 02:10:29 +01:00 |
|
|
iNPUTmice
|
2b21bc13fc
|
Merge branch 'master' into development
|
2014-11-16 00:34:44 +01:00 |
|
|
iNPUTmice
|
ac4eabbd22
|
close cursor for database
|
2014-11-16 00:34:16 +01:00 |
|
|
iNPUTmice
|
88c3537b68
|
parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible
|
2014-11-16 00:20:20 +01:00 |
|
|
Daniel Gultsch
|
0fb1772f18
|
Merge pull request #669 from SamWhited/scramcaching
Cache SCRAM-SHA-1 keys for current session
|
2014-11-15 21:02:13 +01:00 |
|
|
Daniel Gultsch
|
4a8fa8b498
|
Merge pull request #670 from kruks23/translation9
Update Spanish Translations
|
2014-11-15 21:00:05 +01:00 |
|
|
iNPUTmice
|
5a634fdf47
|
small modifications for changing an account status in XmppConnection
|
2014-11-15 20:54:28 +01:00 |
|
|
kruks23
|
0dc711d710
|
Update Spanish Translations
|
2014-11-15 20:48:31 +01:00 |
|
|
Sam Whited
|
a463f82e3b
|
Cache SCRAM-SHA-1 keys for current session
|
2014-11-15 12:57:36 -05:00 |
|
|
Daniel Gultsch
|
69ab8a2adb
|
Merge pull request #668 from SamWhited/auth-pinning
Auth mechanism pinning
|
2014-11-15 17:44:51 +01:00 |
|
|
Sam Whited
|
17cec63c14
|
Set security error status on TLS cert mismatch
|
2014-11-15 11:40:41 -05:00 |
|
|
Sam Whited
|
d2388a5a7e
|
Remove extra status wrapper method
|
2014-11-15 11:31:15 -05:00 |
|
|
Sam Whited
|
251f4d6d7f
|
Add incompatible server status
|
2014-11-15 11:29:58 -05:00 |
|
|
iNPUTmice
|
7ba9854c22
|
fixed some disco / carbon related bugs
|
2014-11-15 17:24:06 +01:00 |
|
|
Sam Whited
|
c09d450db8
|
Add security error status
|
2014-11-15 11:21:47 -05:00 |
|
|
Sam Whited
|
d94b07c916
|
Make account status an enum
|
2014-11-15 11:12:41 -05:00 |
|
|
Sam Whited
|
847877f9d2
|
Add auth method pinning
|
2014-11-15 10:01:08 -05:00 |
|
|
iNPUTmice
|
35bf13f5ef
|
Merge branch 'feature/file_transfer' into development
Conflicts:
src/main/res/values/strings.xml
|
2014-11-15 15:52:15 +01:00 |
|
|
iNPUTmice
|
07b07115d6
|
Merge branch 'feature/foreground_service' into development
Conflicts:
src/main/res/values/strings.xml
|
2014-11-15 15:51:27 +01:00 |
|
|
iNPUTmice
|
5b9c690c47
|
Merge branch 'feature/otr_verification' into development
|
2014-11-15 15:50:35 +01:00 |
|
|
Daniel Gultsch
|
4c504dea7a
|
Merge pull request #665 from SamWhited/issue71
Add SCRAM-SHA1 support
|
2014-11-15 15:34:50 +01:00 |
|
|
iNPUTmice
|
bdc86bb8e3
|
added low priority and removed date in foreground noticfication
|
2014-11-15 15:34:34 +01:00 |
|
|
iNPUTmice
|
3c6b3506e3
|
turn on foreground service in expert settings
|
2014-11-15 15:34:34 +01:00 |
|
|
iNPUTmice
|
41f7848f2c
|
handled more error cases
|
2014-11-15 15:34:12 +01:00 |
|
|
iNPUTmice
|
ca2d86cf87
|
better cleanup after unsuccesful transfers
|
2014-11-15 15:34:12 +01:00 |
|
|
iNPUTmice
|
47d44448f3
|
fixed description in notifications and conversation overview
|
2014-11-15 15:34:12 +01:00 |
|
|
iNPUTmice
|
e0f012dba1
|
fixed resending for files as well
|
2014-11-15 15:34:12 +01:00 |
|
|
iNPUTmice
|
cc4f3702a8
|
made file transfers cancelable
|
2014-11-15 15:34:12 +01:00 |
|