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
/
eu
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2014-05-21
1
-2
/
+17
|
\
|
*
Fix highlight detection in MUC channels
Andreas Straub
2014-05-21
1
-2
/
+17
*
|
further improvment trying to deal with large images
Daniel Gultsch
2014-05-21
1
-1
/
+6
|
/
*
cleaned up shared text
Daniel Gultsch
2014-05-21
6
-26
/
+41
*
auto retry image compression with decreasing sample size
Daniel Gultsch
2014-05-21
1
-17
/
+15
*
close input stream
Daniel Gultsch
2014-05-20
1
-0
/
+1
*
trying to deal with larger images
Daniel Gultsch
2014-05-20
1
-4
/
+17
*
Update Spanish Translations + harcoded just_now
kruks23
2014-05-20
3
-8
/
+8
*
highlight people in conferences by clicken on their picture
Daniel Gultsch
2014-05-20
1
-14
/
+27
*
fixed ping time out after session resume
Daniel Gultsch
2014-05-20
1
-0
/
+1
*
ported pending subscription support to new roster mgmt
Daniel Gultsch
2014-05-20
3
-28
/
+5
*
made roster persistant aka enabled versioning again
Daniel Gultsch
2014-05-19
3
-41
/
+30
*
some code cleanup to deal with the roster mgmt changes from earlier
Daniel Gultsch
2014-05-19
3
-77
/
+54
*
reworked roster/contact handling. might break some stuff. not sycing to disk yet
Daniel Gultsch
2014-05-19
15
-560
/
+332
*
bind and session request more compatible
Daniel Gultsch
2014-05-18
3
-4
/
+19
*
fixed #123 fixed122
Daniel Gultsch
2014-05-18
3
-31
/
+11
*
cleaned up edit account dialog a little
Daniel Gultsch
2014-05-18
1
-20
/
+13
*
fixed #53 aka server not found bug
Daniel Gultsch
2014-05-18
3
-27
/
+39
*
sending session after unsucesfull session resume. fixed #116
Daniel Gultsch
2014-05-17
1
-7
/
+8
*
added record audio button
Daniel Gultsch
2014-05-17
1
-0
/
+8
*
made sending session more compliant
Daniel Gultsch
2014-05-17
1
-2
/
+2
*
receiving pgp images important bug fix
Daniel Gultsch
2014-05-17
1
-1
/
+1
*
Update Validator.java
the-username
2014-05-17
1
-1
/
+1
*
fixed #108
Daniel Gultsch
2014-05-17
1
-3
/
+4
*
permanent notification disapears now when account is being deleted + code cle...
Daniel Gultsch
2014-05-17
3
-16
/
+9
*
fixed #113
Daniel Gultsch
2014-05-17
1
-2
/
+1
*
reworked message to conferences
Daniel Gultsch
2014-05-16
2
-16
/
+19
*
fixed npe for otr sessions with non contacts
Daniel Gultsch
2014-05-16
1
-4
/
+8
*
offline sending of pgp fixed
Daniel Gultsch
2014-05-16
2
-25
/
+43
*
fixed null in shared link
Daniel Gultsch
2014-05-16
1
-1
/
+5
*
French translation + hard-coded string > @string
Benoit Bouvarel
2014-05-16
1
-16
/
+16
*
fixed npe
Daniel Gultsch
2014-05-15
1
-5
/
+3
*
hiding the prepare image toast after error or success
Daniel Gultsch
2014-05-14
2
-3
/
+15
*
fixed possible npe
Daniel Gultsch
2014-05-14
1
-4
/
+3
*
fixed #105
Daniel Gultsch
2014-05-14
2
-29
/
+38
*
made message parser non static
Daniel Gultsch
2014-05-14
2
-64
/
+86
*
code clean up
Daniel Gultsch
2014-05-14
1
-104
/
+51
*
added presence selection
Daniel Gultsch
2014-05-13
1
-5
/
+19
*
Merge branch 'development' into feature/take_picture
Daniel Gultsch
2014-05-13
1
-10
/
+12
|
\
|
*
code cleanup
Daniel Gultsch
2014-05-13
1
-10
/
+12
*
|
takeing pictures over intent
Daniel Gultsch
2014-05-13
3
-42
/
+95
*
|
Merge branch 'development' into feature/take_picture
Daniel Gultsch
2014-05-13
2
-8
/
+10
|
\
|
|
*
static method for providing content uri
Daniel Gultsch
2014-05-13
2
-8
/
+10
*
|
submenu for attach file
Daniel Gultsch
2014-05-13
1
-1
/
+29
|
/
*
ensure that iq response is being send out for jingle packets. remove jingle c...
Daniel Gultsch
2014-05-13
2
-22
/
+44
*
further translations
Daniel Gultsch
2014-05-13
1
-2
/
+2
*
fixed npe in tag writer
Daniel Gultsch
2014-05-13
1
-2
/
+6
*
Better error handling if attach file doesnt work (on permission denied)
0.2-beta
Daniel Gultsch
2014-05-12
9
-102
/
+107
*
fixed possible npe and possible exception
iNPUTmice
2014-05-10
1
-2
/
+9
*
added dialog for otr file transfer
0.2-alpha
Daniel Gultsch
2014-05-09
1
-1
/
+25
[next]