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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-08
2
-2
/
+30
|
\
|
*
Fixes FS#107, Implements FS#77
steckbrief
2016-01-08
2
-2
/
+29
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-04
1
-1
/
+1
|
\
|
|
*
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
3
-1
/
+3
|
\
|
|
*
Log error in case logcat command could not be executed; Show toast in case no...
steckbrief
2015-12-17
3
-1
/
+3
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
18
-219
/
+385
|
\
|
|
*
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
17
-217
/
+382
|
*
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
3
-208
/
+151
|
\
|
|
*
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
36
-422
/
+100
|
\
|
|
*
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
36
-408
/
+74
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-06
3
-2
/
+15
|
\
|
|
*
Fix flagging no more messages on server for conversation
steckbrief
2015-12-06
3
-2
/
+15
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
4
-20
/
+50
|
\
|
|
*
Implements FS#83: Reload from last received message
steckbrief
2015-12-04
4
-20
/
+50
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
1
-3
/
+6
|
\
|
|
*
Implements FS#89 - Change about information
steckbrief
2015-12-04
1
-3
/
+6
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-04
23
-124
/
+124
|
\
|
|
*
Fixes FS#75 - Change color names to reasonable names
steckbrief
2015-12-04
23
-124
/
+124
*
|
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
1
-1
/
+1
|
\
|
|
*
Fixed compile error in inner class
steckbrief
2015-12-02
1
-1
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
42
-227
/
+688
|
\
|
|
*
Partially implements FS#6: Conference ID changed to c+bugs@confere
steckbrief
2015-11-20
2
-1
/
+2
|
*
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
42
-226
/
+686
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-06
22
-579
/
+786
|
\
|
|
*
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
20
-172
/
+601
|
\
|
|
*
Implements FS#26: Introduction of dialog to choose whether to resize a pictur...
steckbrief
2015-11-03
17
-173
/
+549
|
*
Implements FS#24: Introduce setting for picture resizing
steckbrief
2015-10-30
7
-1
/
+52
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-23
11
-30
/
+41
|
\
|
|
*
Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...
steckbrief
2015-10-23
11
-30
/
+39
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-22
1
-1
/
+2
|
\
|
|
*
Implements FS#78: Allow installation on SD card
steckbrief
2015-10-22
1
-1
/
+2
*
|
Merge trz/rename into trz/rebase
steckbrief
2015-10-22
25
-351
/
+536
|
\
|
|
*
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
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-16
2
-1
/
+4
|
\
|
|
*
Fixes FS#82: Background color of conversation list item set to primary backgr...
steckbrief
2015-10-16
2
-1
/
+4
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-15
3
-36
/
+64
|
\
|
|
*
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
2
-1
/
+3
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-05
7
-36
/
+76
|
\
|
|
*
Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...
steckbrief
2015-10-05
7
-36
/
+76
*
|
fixed imports
trz/1.5.2.2
lookshe
2015-10-05
5
-11
/
+11
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2015-10-05
23
-16
/
+700
|
\
|
|
*
Publishing additional information in message details dialog such as message t...
steckbrief
2015-10-04
4
-28
/
+235
[next]