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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
2
-88
/
+3
|
\
|
*
Fixes FS#155: Check FileHelper vs. FileUtils
steckbrief
2016-03-12
5
-97
/
+16
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-12
7
-55
/
+93
|
|
\
|
|
/
|
/
|
|
*
Fixes FS#51: Change toggle in Account Management back to standard
steckbrief
2016-03-11
3
-77
/
+10
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
2
-2
/
+3
|
\
|
|
*
Fixes FS#139: Do not merge messages at all
steckbrief
2016-03-11
8
-149
/
+28
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
2
-4
/
+7
|
\
|
|
*
Fixes FS#157: Trigger loading messages from MAM in MUC does not end
steckbrief
2016-03-10
3
-37
/
+45
|
*
Fixes FS#158: user decision dialog heading configurable and translateable
steckbrief
2016-03-10
2
-4
/
+6
|
*
reset link and highlight colors to system default
steckbrief
2016-03-08
1
-17
/
+20
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
31
-477
/
+874
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-1
/
+2
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-07
7
-13
/
+49
|
|
\
|
*
\
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
133
-3509
/
+13072
|
|
\
\
|
*
|
|
Fixes FS#135: condition NOT message.isRead() added to check if notification s...
steckbrief
2016-02-09
2
-2
/
+2
|
*
|
|
implementation hint for FS#96 added
steckbrief
2016-02-09
1
-0
/
+1
|
*
|
|
Fixes FS#135: condition NOT message.isRead() added to check if notification s...
steckbrief
2016-02-09
1
-6
/
+7
|
*
|
|
Fixed minor class cast issue
steckbrief
2016-01-16
1
-4
/
+4
*
|
|
|
use Build.VERSION_CODES.KITKAT instead of hard coded 19
lookshe
2016-03-08
1
-1
/
+2
|
|
_
|
/
|
/
|
|
*
|
|
corrected getRealPathFromUri
lookshe
2016-03-07
1
-2
/
+40
*
|
|
Finally fixes FS#142
lookshe
2016-03-07
1
-4
/
+0
|
|
/
|
/
|
*
|
Fixes FS#147: Disable OMEMO
steckbrief
2016-03-02
1
-0
/
+4
*
|
Fixes FS#48 and FS#136
trz/merge_1.10.0
lookshe
2016-02-28
1
-3
/
+0
*
|
Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...
steckbrief
2016-02-23
1
-0
/
+8
*
|
Changed access to presences according to new Presence representation in C
steckbrief
2016-02-23
1
-3
/
+3
*
|
Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)
steckbrief
2016-02-23
1
-0
/
+15
*
|
Removed unnecessary dependencies to XmppConnectionService and added allowMess...
steckbrief
2016-02-23
1
-0
/
+4
*
|
Imports organized
steckbrief
2016-02-12
11
-15
/
+3
*
|
Simplification of DNS requests.
steckbrief
2016-02-12
1
-0
/
+12
*
|
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
2
-6
/
+29
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-15
6
-0
/
+280
|
\
|
|
*
Introducing some specialized IqPacketGenerators
steckbrief
2016-01-15
10
-87
/
+283
|
*
Moved all avatar related work to AvatarService
steckbrief
2016-01-15
4
-65
/
+62
|
*
Implements FS#111: Compress resized picture with PNG format
steckbrief
2016-01-15
1
-3
/
+3
|
*
Implements FS#64: Show who wrote last message in conversation overview
steckbrief
2016-01-15
1
-2
/
+12
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-13
2
-0
/
+79
|
\
|
|
*
Moved all avatar related work to AvatarService
steckbrief
2016-01-13
19
-239
/
+318
|
*
Publish avatars as PNG
steckbrief
2016-01-13
1
-1
/
+1
|
*
Fixes FS#107, Implements FS#77
steckbrief
2016-01-08
1
-1
/
+11
|
*
Fixes FS#99: Adjust namespace according to XEP-0363
steckbrief
2016-01-04
1
-1
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-17
1
-1
/
+1
|
\
|
|
*
Log error in case logcat command could not be executed; Show toast in case no...
steckbrief
2015-12-17
1
-1
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
9
-11
/
+291
|
\
|
|
*
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
14
-198
/
+342
|
*
Fixes FS#95: NPE when opening message details for failed file transfer
steckbrief
2015-12-16
1
-1
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-11
1
-0
/
+53
|
\
|
|
*
Removed stupid DNS query code
steckbrief
2015-12-11
3
-205
/
+147
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
6
-128
/
+35
|
\
|
|
*
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
31
-173
/
+97
|
*
Fix flagging no more messages on server for conversation
steckbrief
2015-12-06
3
-2
/
+15
[next]