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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
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
10
-10
/
+423
|
\
|
*
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
36
-226
/
+639
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-06
5
-0
/
+560
|
\
|
|
*
FileBackend splitted into several util classes for separate concerns: AvatarU...
steckbrief
2015-11-06
22
-580
/
+771
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
8
-1
/
+296
|
\
|
|
*
Implements FS#26: Introduction of dialog to choose whether to resize a pictur...
steckbrief
2015-11-03
14
-173
/
+521
|
*
Implements FS#24: Introduce setting for picture resizing
steckbrief
2015-10-30
3
-0
/
+24
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-23
3
-14
/
+19
|
\
|
|
*
Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...
steckbrief
2015-10-23
9
-27
/
+36
*
|
Merge trz/rename into trz/rebase
steckbrief
2015-10-22
3
-7
/
+300
|
\
|
|
*
Access to preferences moved to global utility class ConversationsPlusPreferen...
steckbrief
2015-10-21
24
-350
/
+532
|
*
added comment for clarification, why the timestamp of the first msg of msg li...
steckbrief
2015-10-17
1
-1
/
+1
|
*
Removed unused imports
steckbrief
2015-10-15
1
-4
/
+0
|
*
Fixes FS#81 - avoid jumps after loading messages
steckbrief
2015-10-15
2
-32
/
+64
*
|
fix imports and namespaces
steckbrief
2015-10-05
1
-0
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-05
1
-0
/
+62
|
\
|
|
*
Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...
steckbrief
2015-10-05
6
-35
/
+74
*
|
fixed imports
trz/1.5.2.2
lookshe
2015-10-05
4
-10
/
+10
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2015-10-05
4
-0
/
+418
|
\
|
|
*
Publishing additional information in message details dialog such as message t...
steckbrief
2015-10-04
1
-18
/
+142
|
*
Note added where to change sth. for FS#70
steckbrief
2015-10-04
1
-1
/
+2
|
*
Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...
steckbrief
2015-10-04
8
-3
/
+321
|
*
Fixes FS#49: Highlight the selected conversation in list
steckbrief
2015-09-02
2
-6
/
+9
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-21
1
-3
/
+3
|
|
\
|
|
/
|
/
|
|
*
moved merged files to correct location
lookshe
2015-08-16
3
-0
/
+167
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-16
14
-409
/
+222
|
|
\
|
|
/
|
/
|
|
*
resolve of some compiler errors
lookshe
2015-08-13
3
-1
/
+3
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
61
-2115
/
+3783
|
|
\
|
|
/
|
/
|
|
*
Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference
steckbrief
2015-06-19
1
-2
/
+5
|
*
Status color added to "create conversation" (refers to ticket #22 in flyspray)
steckbrief
2015-06-19
5
-0
/
+34
|
*
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
126
-0
/
+26180
|
/
*
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
1
-1
/
+19
*
new settings to initialisation of Settings
lookshe
2015-04-12
1
-1
/
+1
*
added settings for accepting and downloading files
lookshe
2015-04-12
1
-2
/
+16
*
Color choose dialog
steckbrief
2015-04-11
1
-1
/
+8
*
- Avoiding accessing shared preferences to know if emoticons should be parsed...
steckbrief
2015-01-20
1
-0
/
+55