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
/
res
/
values
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-15
1
-0
/
+1
|
\
|
*
Implements FS#64: Show who wrote last message in conversation overview
steckbrief
2016-01-15
1
-0
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-17
1
-0
/
+1
|
\
|
|
*
Log error in case logcat command could not be executed; Show toast in case no...
steckbrief
2015-12-17
1
-0
/
+1
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
1
-0
/
+5
|
\
|
|
*
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
1
-0
/
+5
*
|
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
1
-13
/
+20
|
\
|
|
*
Fixes FS#75 - Change color names to reasonable names
steckbrief
2015-12-04
1
-13
/
+20
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-0
/
+6
|
\
|
|
*
Partially implements FS#6: Conference ID changed to c+bugs@confere
steckbrief
2015-11-20
1
-0
/
+1
|
*
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
1
-0
/
+5
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
2
-1
/
+19
|
\
|
|
*
Implements FS#26: Introduction of dialog to choose whether to resize a pictur...
steckbrief
2015-11-03
1
-0
/
+4
|
*
Implements FS#24: Introduce setting for picture resizing
steckbrief
2015-10-30
2
-1
/
+15
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-23
1
-2
/
+2
|
\
|
|
*
Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...
steckbrief
2015-10-23
1
-2
/
+2
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-16
1
-0
/
+2
|
\
|
|
*
Fixes FS#82: Background color of conversation list item set to primary backgr...
steckbrief
2015-10-16
1
-0
/
+2
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2015-10-05
1
-0
/
+25
|
\
|
|
*
Publishing additional information in message details dialog such as message t...
steckbrief
2015-10-04
1
-0
/
+21
|
*
Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...
steckbrief
2015-10-04
1
-0
/
+4
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
6
-150
/
+190
|
|
\
|
|
/
|
/
|
|
*
App-Name changed to "Conversations+" in strings.xml
steckbrief
2015-06-19
1
-1
/
+1
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
6
-150
/
+190
|
/
*
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
2
-3
/
+16
*
added settings for accepting and downloading files
lookshe
2015-04-12
1
-1
/
+7
*
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...
steckbrief
2015-04-11
1
-1
/
+3
|
\
|
*
differ between received and read message
lookshe
2015-04-11
1
-1
/
+3
*
|
Color choose dialog
steckbrief
2015-04-11
2
-1
/
+8
|
/
*
no trim of messages or password
lookshe
2015-04-11
1
-0
/
+3
*
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
1
-0
/
+14
|
\
|
*
Added multiple select to Choose Contact Activity
Andreas Straub
2015-03-18
1
-0
/
+4
|
*
show geo uris as 'location' in overview
iNPUTmice
2015-03-10
1
-0
/
+2
|
*
display geo uris as location. show 'send loction' in share menu if request lo...
iNPUTmice
2015-03-07
1
-0
/
+3
|
*
added typing notifications through XEP-0085. fixed #210
iNPUTmice
2015-02-21
1
-0
/
+4
|
*
added actions to error notification
iNPUTmice
2015-02-10
1
-0
/
+1
*
|
Merge master-origin
steckbrief
2015-02-20
6
-50
/
+136
|
\
|
|
*
Remove title_activity_conversations and use app_name instead
kruks23
2015-01-30
1
-1
/
+0
|
*
Use Material Design Icons on API 21+
Sam Whited
2015-01-29
3
-0
/
+42
|
*
show checkbox to hide offline contacts
iNPUTmice
2015-01-21
1
-0
/
+1
|
*
Remove legacy SSL support
Sam Whited
2015-01-19
1
-2
/
+0
|
*
proper desc for offering and sending images in conversations overview
iNPUTmice
2015-01-18
1
-0
/
+2
|
*
use same helper methods for images and files
iNPUTmice
2015-01-18
1
-7
/
+3
|
*
Merge pull request #901 from kriztan/patch-2
Daniel Gultsch
2015-01-18
1
-0
/
+2
|
|
\
|
|
*
Added new file type names for file transfers
Christian S
2015-01-18
1
-0
/
+2
|
*
|
Fix string substitutions with unknown filetypes
Sam Whited
2015-01-17
1
-0
/
+1
|
|
/
|
*
Correct the download file string on notifications
Sam Whited
2015-01-17
1
-4
/
+4
|
*
Add download button on notification if applicable
Sam Whited
2015-01-16
1
-0
/
+1
[next]