iNPUTmice
|
19a3980b76
|
disabled broken conversations context menu
|
2014-11-18 03:12:51 +01:00 |
|
iNPUTmice
|
f2a75bcc1e
|
better usage of synchronized in some places
|
2014-11-18 03:10:59 +01:00 |
|
iNPUTmice
|
f4fa6f91ce
|
better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary
|
2014-11-18 01:48:16 +01:00 |
|
iNPUTmice
|
050e3950c6
|
added rendered versions of new icons
|
2014-11-18 00:42:19 +01:00 |
|
iNPUTmice
|
6175bbb8af
|
Merge branch 'qooob-development' into development
|
2014-11-18 00:41:47 +01:00 |
|
iNPUTmice
|
b3b8ecc492
|
Merge branch 'development' of https://github.com/qooob/Conversations into qooob-development
|
2014-11-18 00:28:37 +01:00 |
|
iNPUTmice
|
2874ab94fa
|
context menu for conversations. fixed #630
|
2014-11-18 00:07:27 +01:00 |
|
Ilia Rostovtsev
|
a47c1a4d87
|
Update README.md
|
2014-11-18 00:58:36 +03:00 |
|
Ilia Rostovtsev
|
3afbcdd64f
|
Updated launcher icon: Bigger circles
|
2014-11-18 00:57:01 +03:00 |
|
Ilia Rostovtsev
|
cc76ff146a
|
Notification icon: Solid version
|
2014-11-18 00:55:50 +03:00 |
|
Ilia Rostovtsev
|
19e7bebf68
|
Notification icon: Dashed-solid version
Keeping this icon in case it's needed later
|
2014-11-18 00:55:20 +03:00 |
|
iNPUTmice
|
536192da20
|
bump to version 0.9-alpha to differentiate stack traces. no feature freeze or anything else
|
2014-11-17 21:40:48 +01:00 |
|
iNPUTmice
|
a4fe956581
|
clear avatar cache with new roster push from server
|
2014-11-17 21:28:16 +01:00 |
|
iNPUTmice
|
a1a103c711
|
avoided some null pointers
|
2014-11-17 20:45:00 +01:00 |
|
iNPUTmice
|
b75564ecd1
|
context menu for muc participants + refactor trueCounterpart to use Jid class
|
2014-11-17 20:02:46 +01:00 |
|
iNPUTmice
|
3e1123d05c
|
synchronized around cache clear in avatar service
|
2014-11-17 20:01:56 +01:00 |
|
Daniel Gultsch
|
a60195589c
|
Merge pull request #681 from SamWhited/searchlocalefix
Use `Locale.US' for string comparisons in search
|
2014-11-17 18:27:21 +01:00 |
|
Sam Whited
|
94bf19cc8e
|
Use `Locale.US' for string comparisons in search
|
2014-11-17 12:19:45 -05:00 |
|
Daniel Gultsch
|
78518f9051
|
Merge pull request #680 from ferdev1/patch-2
Fix string 2
|
2014-11-17 18:14:50 +01:00 |
|
iNPUTmice
|
dd9c42c193
|
trim search before searching
|
2014-11-17 17:31:26 +01:00 |
|
iNPUTmice
|
53461a1c23
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-17 17:24:56 +01:00 |
|
iNPUTmice
|
d8f7b2510f
|
split search keywords by whitespaces and imply AND operatior
|
2014-11-17 17:24:33 +01:00 |
|
iNPUTmice
|
7ee6551670
|
slightly modified logo / launcher icon
|
2014-11-17 17:23:58 +01:00 |
|
ferdev1
|
28105ad6fa
|
Update strings.xml
|
2014-11-17 17:13:20 +01:00 |
|
Daniel Gultsch
|
5d17205f70
|
Merge pull request #679 from SamWhited/lintfix
Fix broken SuppressLint
|
2014-11-17 15:25:58 +01:00 |
|
Sam Whited
|
8fa16aa3c8
|
Fix linter suppression
|
2014-11-17 09:19:11 -05:00 |
|
iNPUTmice
|
f0eb64e772
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-17 01:54:19 +01:00 |
|
iNPUTmice
|
a11f12a468
|
highlight muc members by touching their name in muc details. fixed #503
|
2014-11-17 01:54:01 +01:00 |
|
Daniel Gultsch
|
927bae9b55
|
Merge pull request #675 from ferdev1/patch-1
Fix string
|
2014-11-17 00:04:53 +01:00 |
|
iNPUTmice
|
45fa9a8c4d
|
made tags searchable
|
2014-11-16 23:58:30 +01:00 |
|
iNPUTmice
|
f7bfe471d4
|
fixed regression of xmpp uris not working
|
2014-11-16 22:23:42 +01:00 |
|
ferdev1
|
b5b52a754a
|
Fix string
|
2014-11-16 18:11:14 +01:00 |
|
Daniel Gultsch
|
8b3ff6d764
|
Merge pull request #673 from SamWhited/development
Fix fetching accounts by JIDs
|
2014-11-16 17:35:59 +01:00 |
|
iNPUTmice
|
d026a7a13b
|
happy hanukkah
|
2014-11-16 17:21:21 +01:00 |
|
Sam Whited
|
643d10e02c
|
Fix fetching accounts by JIDs
Fixes a crash when publishing an avatar
|
2014-11-16 10:04:45 -05:00 |
|
iNPUTmice
|
dcc8db3eeb
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-16 12:28:21 +01:00 |
|
iNPUTmice
|
9fae1bfba5
|
Merge branch 'master' into development
Conflicts:
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
|
2014-11-16 12:27:17 +01:00 |
|
iNPUTmice
|
6a40d23eaa
|
version bump to 0.8.4
|
2014-11-16 12:25:08 +01:00 |
|
iNPUTmice
|
b30f1c6408
|
show full time stamp in connection established field
|
2014-11-16 12:11:40 +01:00 |
|
iNPUTmice
|
af09f0836b
|
show full time stamp in connection established field
|
2014-11-16 12:11:14 +01:00 |
|
iNPUTmice
|
c28bbbba5e
|
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
|
f494b6e43f
|
better error checking in ssl switch over
|
2014-11-16 12:00:53 +01:00 |
|
Daniel Gultsch
|
09dbac94f3
|
Merge pull request #672 from SamWhited/development
Don't escape passwords in SASL
|
2014-11-16 03:13:53 +01:00 |
|
Sam Whited
|
8fca67fc3e
|
Don't escape passwords in SASL
Fixes #671
|
2014-11-15 21:11:14 -05:00 |
|
iNPUTmice
|
9a6800d647
|
made scan and show qr code more accessible in VerifyOtrActivity
|
2014-11-16 02:10:29 +01:00 |
|
iNPUTmice
|
6743fb1acd
|
Merge branch 'master' into development
|
2014-11-16 00:34:44 +01:00 |
|
iNPUTmice
|
ed4225e77d
|
close cursor for database
|
2014-11-16 00:34:16 +01:00 |
|
iNPUTmice
|
caf943c1a9
|
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
|
bc75cdaa41
|
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
|
2d65c87c4d
|
Merge pull request #670 from kruks23/translation9
Update Spanish Translations
|
2014-11-15 21:00:05 +01:00 |
|