Michael
|
7596a01652
|
update android gradle plugin to 0.14.4
to work with AS >= 0.9.0 plugin >= 0.14.0 is required
also update gradle to 2.2.
|
2014-11-22 19:53:37 +01:00 |
|
Daniel Gultsch
|
da4a6691fb
|
Merge pull request #709 from kruks23/translation
Update spanish translations
|
2014-11-22 00:42:48 +01:00 |
|
kruks23
|
51bb0e4cc9
|
Update spanish translations
|
2014-11-22 00:37:41 +01:00 |
|
iNPUTmice
|
ac6d6fefaf
|
work around to not confuse irc transport with real conference servers
|
2014-11-21 20:34:19 +01:00 |
|
Daniel Gultsch
|
ac827d2e60
|
Merge pull request #706 from betheg/unused_imports
remove unused imports.
|
2014-11-21 20:03:46 +01:00 |
|
iNPUTmice
|
c8f13f3141
|
update action bar with conversations updates as well
|
2014-11-21 20:02:13 +01:00 |
|
Daniel Gultsch
|
56efcf4a11
|
Merge pull request #707 from betheg/joinmuc
MUC: set from when join muc.
|
2014-11-21 20:00:25 +01:00 |
|
Michael
|
a3a4653a26
|
MUC: set from when join muc.
|
2014-11-21 19:37:50 +01:00 |
|
Michael
|
3db72ab68a
|
remove unused imports.
|
2014-11-21 19:17:27 +01:00 |
|
iNPUTmice
|
ba9ecd58bf
|
move task to back and not finish when hitting back button
|
2014-11-21 18:57:27 +01:00 |
|
Daniel Gultsch
|
84e6afefad
|
Merge pull request #705 from betheg/muc
STATUS_CODE_SELF_PRESENCE is not set in all case.
|
2014-11-21 17:06:12 +01:00 |
|
Michael
|
dc28120c44
|
STATUS_CODE_SELF_PRESENCE is not set in all case.
|
2014-11-21 16:14:56 +01:00 |
|
iNPUTmice
|
aa7d11685f
|
additional null pointer saftey checks
|
2014-11-21 15:25:57 +01:00 |
|
iNPUTmice
|
ef4eb5f06b
|
verify contacts key only on initiating side of smp
|
2014-11-21 13:42:25 +01:00 |
|
iNPUTmice
|
62e9c5a011
|
changed listener timing and cache clearing after muc presences
|
2014-11-20 22:44:31 +01:00 |
|
iNPUTmice
|
906c9f5668
|
create file and dirs before creating file
|
2014-11-20 22:02:32 +01:00 |
|
Daniel Gultsch
|
b01889eacd
|
Merge pull request #698 from kriztan/patch-1
Update german translations
|
2014-11-20 21:47:12 +01:00 |
|
Daniel Gultsch
|
aad8738807
|
Merge pull request #699 from betheg/status_code
change status codes string 'number' to a better readable constant.
|
2014-11-20 21:46:40 +01:00 |
|
Michael
|
e2f82dfacb
|
change status codes string 'number' to a better readable constant.
|
2014-11-20 21:37:56 +01:00 |
|
kriztan
|
8e598c0029
|
Update german translations
|
2014-11-20 19:20:49 +01:00 |
|
iNPUTmice
|
7cfbc97750
|
fixed potential NPEs
|
2014-11-20 18:42:47 +01:00 |
|
iNPUTmice
|
030b203073
|
import fixes
|
2014-11-20 18:33:04 +01:00 |
|
iNPUTmice
|
fd01f821e6
|
Merge branch 'development' of https://github.com/siacs/Conversations into development
|
2014-11-20 18:20:45 +01:00 |
|
iNPUTmice
|
17fcd3d4a6
|
brought ad hoc conferences back. fixed #688 fixed #367
|
2014-11-20 18:20:42 +01:00 |
|
Daniel Gultsch
|
f832fe1c88
|
Merge pull request #696 from SamWhited/development
Remove broken / unused imports
|
2014-11-19 21:20:15 +01:00 |
|
Sam Whited
|
2cc897c1d4
|
Remove broken / unused imports
|
2014-11-19 14:57:23 -05:00 |
|
iNPUTmice
|
5ca14bf457
|
sent read marker to full jid
|
2014-11-19 17:40:42 +01:00 |
|
iNPUTmice
|
4c1135c222
|
some saftey checks before registering listeners in XmppActivity
|
2014-11-19 17:31:28 +01:00 |
|
Daniel Gultsch
|
9d049e10ad
|
Merge pull request #691 from kruks23/development
Update spanish translation
|
2014-11-19 17:22:57 +01:00 |
|
Daniel Gultsch
|
a92a626d2d
|
Merge pull request #692 from kriztan/patch-3
Update german translations
|
2014-11-19 17:22:50 +01:00 |
|
Daniel Gultsch
|
3f63a921aa
|
Merge pull request #694 from beriain/development
Update basque translation
|
2014-11-19 17:22:35 +01:00 |
|
Aitor Beriain
|
553583fd2c
|
Update basque translation
|
2014-11-19 16:12:31 +01:00 |
|
kriztan
|
ecbd2b9997
|
Update german translations
|
2014-11-19 08:51:23 +01:00 |
|
kruks23
|
a0b5e3509b
|
Update spanish translations
|
2014-11-19 00:16:45 +01:00 |
|
kruks23
|
c6074a6bc1
|
Update spanish translations
|
2014-11-18 23:53:37 +01:00 |
|
iNPUTmice
|
c8e19f91bf
|
added faq for srv records
|
2014-11-18 23:26:22 +01:00 |
|
iNPUTmice
|
026aceec37
|
put error notification into notification service
|
2014-11-18 15:26:28 +01:00 |
|
iNPUTmice
|
6db71812fb
|
simplified message merge condition
|
2014-11-18 14:49:49 +01:00 |
|
iNPUTmice
|
ccc689ec67
|
synchronized message list in conversation fragment
|
2014-11-18 14:43:15 +01:00 |
|
iNPUTmice
|
d5a159a2b5
|
show dynamic tags in contacts activity as well
|
2014-11-18 14:24:06 +01:00 |
|
iNPUTmice
|
c18cae7fa2
|
properly remove conversations context menu
|
2014-11-18 13:51:04 +01:00 |
|
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 |
|