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
/
de
/
thedevstack
/
conversationsplus
/
xmpp
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-10-20
24
-6
/
+716
|
\
|
*
xmpp.httpupload moved to new namespace xmpp.filetransfer.http.upload; delete ...
steckbrief
2016-08-23
8
-8
/
+10
|
*
Improved error handling for httpupload
steckbrief
2016-08-22
1
-4
/
+7
|
*
Basic filetransfer http delete implementation; Exceptions for IqPacketError a...
steckbrief
2016-08-22
11
-12
/
+260
|
*
FileTransfer reworked (first steps - functionality as is), HttpUpload
steckbrief
2016-05-29
14
-17
/
+346
|
*
Fixed javadoc of HttpUploadHint
steckbrief
2016-05-26
1
-1
/
+11
|
*
Fixed javadoc of PubSub Element Generation/Parsing
steckbrief
2016-05-26
3
-5
/
+114
|
*
XmppConnectionService.markMessage moved to MessageUtil
steckbrief
2016-05-09
2
-9
/
+8
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-23
1
-0
/
+15
|
\
|
|
*
Merge branch 'master' into introduce_cplus_database_version
steckbrief
2016-04-18
1
-59
/
+84
|
|
\
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-17
1
-59
/
+84
|
|
|
\
|
|
_
|
/
|
/
|
|
|
*
|
DatabaseBackend updated to serve Conversatiosn Database version and Conversat...
steckbrief
2016-04-17
1
-0
/
+15
|
|
/
|
*
Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences
steckbrief
2016-04-06
1
-1
/
+2
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-05
3
-13
/
+43
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
2
-6
/
+8
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
1
-2
/
+2
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-12
1
-33
/
+29
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-4
/
+4
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-07
1
-1
/
+2
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
22
-559
/
+1032
|
|
\
|
|
/
|
/
|
|
*
Fixed minor class cast issue
steckbrief
2016-01-16
1
-4
/
+4
*
|
Imports organized
steckbrief
2016-02-12
2
-2
/
+0
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-15
46
-4122
/
+20
|
/
*
Introducing some specialized IqPacketGenerators
steckbrief
2016-01-15
6
-0
/
+276
*
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
1
-1
/
+2
*
Removed stupid DNS query code
steckbrief
2015-12-11
1
-55
/
+23
*
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
5
-6
/
+7
*
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
5
-97
/
+97
*
FileBackend splitted into several util classes for separate concerns: AvatarU...
steckbrief
2015-11-06
3
-9
/
+10
*
Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...
steckbrief
2015-10-23
1
-3
/
+3
*
Access to preferences moved to global utility class ConversationsPlusPreferen...
steckbrief
2015-10-21
1
-11
/
+0
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
9
-226
/
+399
*
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
40
-0
/
+3973