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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
fixed merge error
lookshe
2016-03-20
1
-1
/
+1
*
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
3
-19
/
+27
|
\
|
*
fixed merge errors
lookshe
2016-03-20
1
-1
/
+1
*
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
8
-74
/
+115
|
\
|
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-12
2
-88
/
+3
|
|
\
*
|
|
Fixes FS#167: Resized images are larger than original images
steckbrief
2016-03-18
1
-2
/
+2
*
|
|
Fixes FS#164
lookshe
2016-03-18
1
-8
/
+0
*
|
|
Fixes FS#156 and FS#135 (occured again)
lookshe
2016-03-17
1
-4
/
+10
*
|
|
completely implements FS#161
lookshe
2016-03-17
3
-14
/
+41
*
|
|
partially implements FS#161
lookshe
2016-03-16
2
-17
/
+49
*
|
|
once again: FS#34 - review all calls for String.trim()
lookshe
2016-03-14
2
-4
/
+4
|
|
/
|
/
|
*
|
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
|
\
|
|
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
2
-2
/
+3
|
|
\
|
*
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
2
-4
/
+7
|
|
\
\
*
|
|
|
Fixes FS#51: Change toggle in Account Management back to standard
steckbrief
2016-03-11
3
-77
/
+10
|
|
_
|
/
|
/
|
|
*
|
|
Fixes FS#139: Do not merge messages at all
steckbrief
2016-03-11
8
-149
/
+28
|
|
/
|
/
|
*
|
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
|
\
|
|
*
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
7
-13
/
+49
|
\
|
|
*
corrected getRealPathFromUri
lookshe
2016-03-07
1
-2
/
+40
|
*
Finally fixes FS#142
lookshe
2016-03-07
1
-4
/
+0
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
133
-3509
/
+13072
|
\
|
|
*
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
|
|
\
|
*
\
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-17
1
-1
/
+1
|
|
\
\
\
|
*
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
9
-11
/
+291
|
|
\
\
\
\
|
*
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-11
1
-0
/
+53
|
|
\
\
\
\
\
|
*
\
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
9
-362
/
+9
|
|
\
\
\
\
\
\
|
*
\
\
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
1
-7
/
+2
|
|
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
2
-2
/
+4
|
*
|
|
|
|
|
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
9
-7
/
+420
|
|
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-06
5
-0
/
+560
|
|
\
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
8
-1
/
+296
|
|
\
\
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-23
2
-0
/
+19
|
|
\
\
\
\
\
\
\
\
\
\
\
|
*
\
\
\
\
\
\
\
\
\
\
\
Merge trz/rename into trz/rebase
steckbrief
2015-10-22
2
-0
/
+296
|
|
\
\
\
\
\
\
\
\
\
\
\
\
|
*
|
|
|
|
|
|
|
|
|
|
|
|
fix imports and namespaces
steckbrief
2015-10-05
1
-0
/
+2
[next]
