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
/
ui
/
ConversationFragment.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
FileTransfer reworked (first steps - functionality as is), HttpUpload
steckbrief
2016-05-29
1
-2
/
+2
*
XmppConnectionService.markMessage moved to MessageUtil
steckbrief
2016-05-09
1
-1
/
+2
*
Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences
steckbrief
2016-04-06
1
-2
/
+2
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-05
1
-2
/
+2
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
1
-7
/
+21
*
Fixes FS#164
lookshe
2016-03-18
1
-8
/
+0
*
completely implements FS#161
lookshe
2016-03-17
1
-1
/
+9
*
Fixes FS#139: Do not merge messages at all
steckbrief
2016-03-11
1
-1
/
+1
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-8
/
+26
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
1
-250
/
+376
*
Implements FS#83: Reload from last received message
steckbrief
2015-12-04
1
-3
/
+4
*
FileBackend splitted into several util classes for separate concerns: AvatarU...
steckbrief
2015-11-06
1
-4
/
+3
*
Access to preferences moved to global utility class ConversationsPlusPreferen...
steckbrief
2015-10-21
1
-11
/
+12
*
Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...
steckbrief
2015-10-04
1
-2
/
+4
*
moved merged files to correct location
lookshe
2015-08-16
1
-0
/
+1
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-16
1
-145
/
+53
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
1
-185
/
+308
*
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-0
/
+1185