moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-15 03:52:17 -05:00
Code Issues Releases Wiki Activity
2,306 Commits 5 Branches 73 Tags 39 MiB
51aeeb766c
Commit Graph

2306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruks23
8f33f3540a Update spanish translations 2014-11-18 23:53:37 +01:00
iNPUTmice
ad0edfb839 added faq for srv records 2014-11-18 23:26:22 +01:00
iNPUTmice
66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice
1122e084a0 simplified message merge condition 2014-11-18 14:49:49 +01:00
iNPUTmice
10bf2b77a8 synchronized message list in conversation fragment 2014-11-18 14:43:15 +01:00
iNPUTmice
dcebc120ac show dynamic tags in contacts activity as well 2014-11-18 14:24:06 +01:00
iNPUTmice
ab832bcff7 properly remove conversations context menu 2014-11-18 13:51:04 +01:00
iNPUTmice
d29c861d03 disabled broken conversations context menu 2014-11-18 03:12:51 +01:00
iNPUTmice
018a0c7978 better usage of synchronized in some places 2014-11-18 03:10:59 +01:00
iNPUTmice
090e6ecf09 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
d2a4855a1e added rendered versions of new icons 2014-11-18 00:42:19 +01:00
iNPUTmice
078f0ea103 Merge branch 'qooob-development' into development 2014-11-18 00:41:47 +01:00
iNPUTmice
ef681c2a96 Merge branch 'development' of https://github.com/qooob/Conversations into qooob-development 2014-11-18 00:28:37 +01:00
iNPUTmice
240d2d68c8 context menu for conversations. fixed #630 2014-11-18 00:07:27 +01:00
Ilia Rostovtsev
a4c884829a Update README.md 2014-11-18 00:58:36 +03:00
Ilia Rostovtsev
f9e61f154b Updated launcher icon: Bigger circles 2014-11-18 00:57:01 +03:00
Ilia Rostovtsev
0bf108a95d Notification icon: Solid version 2014-11-18 00:55:50 +03:00
Ilia Rostovtsev
853bddd07f Notification icon: Dashed-solid version 
Keeping this icon in case it's needed later
 2014-11-18 00:55:20 +03:00
iNPUTmice
123036fdaa 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
86241a260a clear avatar cache with new roster push from server 2014-11-17 21:28:16 +01:00
iNPUTmice
abbadcb58b avoided some null pointers 2014-11-17 20:45:00 +01:00
iNPUTmice
f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class 2014-11-17 20:02:46 +01:00
iNPUTmice
283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
Daniel Gultsch
c058594ff5 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
b6d8977237 Use `Locale.US' for string comparisons in search 2014-11-17 12:19:45 -05:00
Daniel Gultsch
e664a0c936 Merge pull request #680 from ferdev1/patch-2 
Fix string 2
 2014-11-17 18:14:50 +01:00
iNPUTmice
8865cc406c trim search before searching 2014-11-17 17:31:26 +01:00
iNPUTmice
1a5af45afb Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-17 17:24:56 +01:00
iNPUTmice
252c7e68d6 split search keywords by whitespaces and imply AND operatior 2014-11-17 17:24:33 +01:00
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