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
/
eu
/
siacs
/
conversations
/
ui
/
SettingsActivity.java
(
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
-7
/
+12
|
\
|
*
rely on refreshUi/refreshUiReal and make sure it is being used everywhere
Daniel Gultsch
2015-07-20
1
-0
/
+4
|
*
Optimize imports
Andreas Straub
2015-07-20
1
-13
/
+11
|
*
Add option to remove manually approved certificates
BrianBlade
2015-04-19
1
-0
/
+91
|
*
maintain state when rotating settings activity
iNPUTmice
2015-04-14
1
-14
/
+16
|
*
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...
iNPUTmice
2015-04-14
1
-1
/
+2
|
|
\
|
|
*
Add option to use MTM without default TrustManager
BrianBlade
2015-04-11
1
-1
/
+2
|
*
|
don't resume old session when changing resource
iNPUTmice
2015-04-09
1
-3
/
+9
|
|
/
*
|
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
lookshe
2015-08-16
1
-2
/
+6
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-16
/
+115
*
|
changed received and read confirmation setting to one list and put it to sett...
lookshe
2015-04-14
1
-2
/
+3
*
|
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
1
-1
/
+1
|
\
|
|
*
avoid unnecessary thread creation
iNPUTmice
2015-03-05
1
-1
/
+1
*
|
Merge master-origin
steckbrief
2015-02-20
1
-0
/
+9
|
\
|
|
*
adapt caps on whether or not message confirmation is on
iNPUTmice
2015-01-26
1
-0
/
+8
*
|
- Avoiding accessing shared preferences to know if emoticons should be parsed...
steckbrief
2015-01-20
1
-14
/
+19
|
/
*
remove unused imports.
Michael
2014-11-21
1
-1
/
+0
*
turn on foreground service in expert settings
iNPUTmice
2014-11-15
1
-0
/
+2
*
It builds again!
Sam Whited
2014-11-09
1
-2
/
+4
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+74