index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge pull request #262 from kruks23/development
Daniel Gultsch
2014-07-11
1
-1
/
+1
|
\
|
*
Show time in messages previous days
kruks23
2014-07-10
1
-2
/
+2
|
*
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
kruks23
2014-07-10
7
-18
/
+393
|
|
\
|
*
\
Merge branch 'development' of https://github.com/siacs/Conversations into dev...
kruks23
2014-07-09
3
-32
/
+26
|
|
\
\
|
*
|
|
Show time in messages previous days
kruks23
2014-07-08
1
-1
/
+1
*
|
|
|
dirty push / delete flags are not set/reset correctly
iNPUTmice
2014-07-10
1
-4
/
+2
*
|
|
|
fixed #38
iNPUTmice
2014-07-10
6
-7
/
+126
|
|
_
|
/
|
/
|
|
*
|
|
added create contact dialog
iNPUTmice
2014-07-10
1
-1
/
+64
*
|
|
added contextual menu for contacts
iNPUTmice
2014-07-10
4
-15
/
+69
*
|
|
small changes
iNPUTmice
2014-07-10
1
-19
/
+1
*
|
|
made searchview text color white
iNPUTmice
2014-07-10
1
-0
/
+4
*
|
|
filter contacts and starting confercenes
iNPUTmice
2014-07-10
4
-24
/
+179
*
|
|
added group add button
iNPUTmice
2014-07-10
1
-4
/
+9
*
|
|
added action bar menu to start conversation
iNPUTmice
2014-07-10
1
-0
/
+21
*
|
|
changed support lib to v13. added tabs and fragments to start conversation ac...
iNPUTmice
2014-07-10
2
-1
/
+81
*
|
|
inital activity
iNPUTmice
2014-07-10
1
-0
/
+11
|
|
/
|
/
|
*
|
unified warnings/error msgs
iNPUTmice
2014-07-09
3
-32
/
+26
|
/
*
contact tiles follow material colors as well
iNPUTmice
2014-07-08
2
-6
/
+13
*
made account jid lowercase
iNPUTmice
2014-07-04
1
-1
/
+2
*
made contact jids lower case
iNPUTmice
2014-07-04
2
-2
/
+4
*
added timeout to jingle socket
iNPUTmice
2014-07-03
2
-3
/
+16
*
more xmlpullparser fixes
iNPUTmice
2014-07-03
1
-0
/
+2
*
Merge branch 'development'
iNPUTmice
2014-07-03
2
-2
/
+6
|
\
|
*
fixed array out of bounds in isMuc
iNPUTmice
2014-07-03
1
-2
/
+5
|
*
enabled anti alising for tiles
iNPUTmice
2014-07-02
1
-0
/
+1
*
|
allow state loss on fragment change
iNPUTmice
2014-07-01
1
-1
/
+1
*
|
fixed npe on rare occasion of show element in presence being null
iNPUTmice
2014-07-01
1
-1
/
+1
|
/
*
fixed #216
iNPUTmice
2014-07-01
1
-3
/
+7
*
fixed image sharing with contacts that have multiple presences
iNPUTmice
2014-07-01
1
-16
/
+25
*
removed old notification icon
iNPUTmice
2014-06-30
1
-1
/
+1
*
fixed rare npe in verify otr fingerprint dialog
iNPUTmice
2014-06-30
1
-4
/
+6
*
possible fix for #232
iNPUTmice
2014-06-30
1
-6
/
+35
*
couple of modifications for disco discovery
iNPUTmice
2014-06-30
1
-3
/
+12
*
fixed #235
iNPUTmice
2014-06-30
2
-129
/
+164
*
fixed #228
iNPUTmice
2014-06-30
2
-1
/
+12
*
added error message for #240
iNPUTmice
2014-06-30
1
-3
/
+19
*
more error handling for jingle connections
iNPUTmice
2014-06-29
9
-57
/
+89
*
raised ping time out
iNPUTmice
2014-06-27
1
-3
/
+3
*
faulty otr messages now generate an error
iNPUTmice
2014-06-26
3
-5
/
+25
*
fixed rare bug with attach image menu
iNPUTmice
2014-06-26
1
-0
/
+6
*
moved some try catchs around
iNPUTmice
2014-06-25
1
-5
/
+5
*
more npe fixes
iNPUTmice
2014-06-25
2
-3
/
+8
*
fixed two rare npe
iNPUTmice
2014-06-25
2
-44
/
+49
*
more kxml fuck ups fixed
iNPUTmice
2014-06-25
1
-0
/
+2
*
fixed odd occurrences of a cursor returned by the system being NULL. wtf ukas
iNPUTmice
2014-06-25
1
-0
/
+3
*
wraped stanza writer in try catch
iNPUTmice
2014-06-25
1
-5
/
+11
*
removed unecessary logging
iNPUTmice
2014-06-25
1
-5
/
+0
*
wrap wakelock release with try catch
iNPUTmice
2014-06-25
3
-7
/
+7
*
some fixes for otr with multiple parties
iNPUTmice
2014-06-25
2
-1
/
+10
*
more otr fixes
iNPUTmice
2014-06-24
2
-14
/
+24
[next]