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
/
main
/
java
/
eu
/
siacs
/
conversations
/
xmpp
/
jingle
/
JingleConnectionManager.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-05-09
1
-1
/
+4
|
\
*
|
Imports organized
steckbrief
2016-02-12
1
-4
/
+0
*
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-1
/
+5
|
\
\
|
*
|
pgp fixes and revert configuration changes
Daniel Gultsch
2015-11-25
1
-1
/
+1
|
*
|
Optimize imports
Andreas Straub
2015-07-20
1
-3
/
+5
|
*
|
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
1
-3
/
+2
|
*
|
initial http upload support
Daniel Gultsch
2015-06-29
1
-4
/
+4
|
*
|
let jingle connection and manager handle message status
Daniel Gultsch
2015-05-16
1
-0
/
+6
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
1
-1
/
+3
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-3
/
+3
|
\
|
|
|
*
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-164
/
+0
|
|
/
*
/
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-5
/
+10
|
/
*
code cleanup for jingle proxy discovery
Daniel Gultsch
2015-01-09
1
-45
/
+31
*
Make IqPacket type an enum
Sam Whited
2015-01-04
1
-2
/
+2
*
Fix typo in method name
Sam Whited
2014-12-29
1
-1
/
+1
*
progress for ibb transfers
iNPUTmice
2014-11-15
1
-0
/
+4
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
1
-3
/
+3
*
Update more files to use JID objects
Sam Whited
2014-11-09
1
-6
/
+12
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
1
-2
/
+7
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+163