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
/
dialogs
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-1
/
+3
|
\
|
*
Implements FS#173: Move access to colors to separate helper class
steckbrief
2016-03-29
1
-1
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-28
1
-3
/
+1
|
\
|
|
*
Fixes FS#170: Message Details: Status display has different Text color
steckbrief
2016-03-28
1
-3
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
1
-1
/
+1
|
\
|
|
*
Fixes FS#139: Do not merge messages at all
steckbrief
2016-03-11
1
-1
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-10
1
-3
/
+4
|
\
|
|
*
Fixes FS#158: user decision dialog heading configurable and translateable
steckbrief
2016-03-10
1
-3
/
+4
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
1
-1
/
+1
|
|
\
|
|
/
|
/
|
*
|
Imports organized
steckbrief
2016-02-12
1
-1
/
+0
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
1
-1
/
+2
|
\
|
|
*
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-10
1
-1
/
+2
|
\
|
|
*
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
1
-1
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
1
-7
/
+2
|
\
|
|
*
Fixes FS#75 - Change color names to reasonable names
steckbrief
2015-12-04
1
-7
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-2
/
+2
|
\
|
|
*
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
1
-2
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
2
-1
/
+72
|
\
|
|
*
Implements FS#26: Introduction of dialog to choose whether to resize a pictur...
steckbrief
2015-11-03
2
-1
/
+72
*
|
fixed imports
trz/1.5.2.2
lookshe
2015-10-05
2
-5
/
+5
|
/
*
Publishing additional information in message details dialog such as message t...
steckbrief
2015-10-04
1
-18
/
+142
*
Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...
steckbrief
2015-10-04
2
-0
/
+184
