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
/
xml
/
preferences.xml
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.6.3' into trz/rebase
trz/merge_1.6.3
lookshe
2015-08-24
1
-101
/
+94
|
\
|
*
removed expert setting to 'force encryption'. merged certifcate and encryptio...
Daniel Gultsch
2015-07-31
1
-82
/
+75
|
*
treat private, non-anonymous mucs like 1:1 chats notification wise
Daniel Gultsch
2015-07-22
1
-1
/
+1
|
*
replace send button with quick action button as long as no text has been entered
Daniel Gultsch
2015-05-02
1
-0
/
+8
|
*
Add option to remove manually approved certificates
BrianBlade
2015-04-19
1
-5
/
+11
|
*
maintain state when rotating settings activity
iNPUTmice
2015-04-14
1
-4
/
+10
|
*
Add option to use MTM without default TrustManager
BrianBlade
2015-04-11
1
-0
/
+5
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-2
/
+24
*
|
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
1
-61
/
+62
*
|
added settings for accepting and downloading files
lookshe
2015-04-12
1
-6
/
+25
*
|
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...
steckbrief
2015-04-11
1
-0
/
+6
|
\
\
|
*
|
differ between received and read message
lookshe
2015-04-11
1
-0
/
+6
*
|
|
Color choose dialog
steckbrief
2015-04-11
1
-3
/
+5
|
/
/
*
|
Configurable LED color (Attention: Expert setting because currently only text...
steckbrief
2015-03-31
1
-0
/
+5
*
|
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
1
-0
/
+6
|
\
|
|
*
added typing notifications through XEP-0085. fixed #210
iNPUTmice
2015-02-21
1
-0
/
+7
*
|
Merge master-origin
steckbrief
2015-02-20
1
-5
/
+12
|
\
|
|
*
Remove legacy SSL support
Sam Whited
2015-01-19
1
-5
/
+0
|
*
Add option to swap enter/emoticon key
Sam Whited
2015-01-14
1
-0
/
+5
|
*
Introduced expert options to control enter-is-send
Daniel Gultsch
2015-01-09
1
-0
/
+7
*
|
Setting added for parsing emoticons or not
Tristan Zur
2015-01-11
1
-0
/
+5
|
/
*
Add quiet hours feature
Sam Whited
2014-12-14
1
-2
/
+23
*
happy hanukkah
iNPUTmice
2014-11-16
1
-0
/
+5
*
turn on foreground service in expert settings
iNPUTmice
2014-11-15
1
-0
/
+5
*
Convert about dialog to activity
Sam Whited
2014-11-04
1
-6
/
+2
*
Add about dialog with license info
Sam Whited
2014-11-04
1
-0
/
+7
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+114
