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
/
utils
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
1
-4
/
+5
|
\
*
|
Show file name instead of mime type (FS#102)
lookshe
2016-03-20
1
-1
/
+1
*
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
1
-0
/
+2
|
\
|
*
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
1
-1
/
+8
|
\
|
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
1
-82
/
+0
|
|
\
|
|
/
|
/
|
*
|
Fixes FS#155: Check FileHelper vs. FileUtils
steckbrief
2016-03-12
2
-87
/
+10
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-12
2
-3
/
+31
|
\
|
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
1
-1
/
+2
|
|
\
|
|
/
|
/
|
*
|
Fixes FS#139: Do not merge messages at all
steckbrief
2016-03-11
1
-1
/
+2
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-1
/
+4
|
\
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-1
/
+2
|
\
|
|
*
use Build.VERSION_CODES.KITKAT instead of hard coded 19
lookshe
2016-03-08
1
-1
/
+2
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-07
2
-4
/
+43
|
\
|
|
*
corrected getRealPathFromUri
lookshe
2016-03-07
1
-2
/
+40
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
19
-177
/
+662
|
\
|
|
*
Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...
steckbrief
2016-02-23
1
-0
/
+8
|
*
Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)
steckbrief
2016-02-23
1
-0
/
+15
|
*
Imports organized
steckbrief
2016-02-12
3
-5
/
+0
|
*
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
1
-0
/
+22
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-13
2
-0
/
+79
|
|
\
|
|
/
|
/
|
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
2
-0
/
+132
|
|
\
|
*
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
3
-126
/
+3
|
|
\
\
|
*
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
3
-5
/
+129
|
|
\
\
\
|
*
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-06
3
-0
/
+526
|
|
\
\
\
\
|
*
|
|
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
15
-2075
/
+0
*
|
|
|
|
|
Moved all avatar related work to AvatarService
steckbrief
2016-01-13
2
-0
/
+78
*
|
|
|
|
|
Fixes FS#99: Adjust namespace according to XEP-0363
steckbrief
2016-01-04
1
-1
/
+1
|
|
_
|
_
|
_
|
/
|
/
|
|
|
|
*
|
|
|
|
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
2
-0
/
+132
*
|
|
|
|
Removed stupid DNS query code
steckbrief
2015-12-11
1
-150
/
+71
|
|
_
|
_
|
/
|
/
|
|
|
*
|
|
|
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
7
-132
/
+10
*
|
|
|
Fixed compile error in inner class
steckbrief
2015-12-02
1
-1
/
+1
|
|
_
|
/
|
/
|
|
*
|
|
Partially implements FS#6: Conference ID changed to c+bugs@confere
steckbrief
2015-11-20
1
-1
/
+1
*
|
|
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
7
-17
/
+141
|
|
/
|
/
|
*
|
FileBackend splitted into several util classes for separate concerns: AvatarU...
steckbrief
2015-11-06
3
-0
/
+523
|
/
*
Implements FS#26: Introduction of dialog to choose whether to resize a pictur...
steckbrief
2015-11-03
1
-0
/
+43
*
Access to preferences moved to global utility class ConversationsPlusPreferen...
steckbrief
2015-10-21
1
-5
/
+3
*
Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...
steckbrief
2015-10-05
1
-13
/
+2
*
Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...
steckbrief
2015-10-04
1
-0
/
+18
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-16
1
-132
/
+3
*
resolve of some compiler errors
lookshe
2015-08-13
1
-0
/
+1
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
7
-96
/
+661
*
Status color added to "create conversation" (refers to ticket #22 in flyspray)
steckbrief
2015-06-19
1
-0
/
+15
*
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
13
-0
/
+1618