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
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Related to FS#199: fixed merge hickups (message correction setting removed, k...
steckbrief
2016-04-18
1
-6
/
+1
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-17
1
-11
/
+29
|
\
|
*
Merge tag '1.11.7' into trz/merge_1.11.7
lookshe
2016-04-17
1
-11
/
+29
|
|
\
|
|
*
add setting for quick sharing
Daniel Gultsch
2016-04-14
1
-15
/
+22
|
|
*
introduced setting to turn of notification led
Daniel Gultsch
2016-04-09
1
-1
/
+6
|
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-27
1
-0
/
+4
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Fixes FS#166 - Images cannot be opened since storing in private image folder
lookshe
2016-03-27
1
-0
/
+4
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-0
/
+6
|
\
|
|
|
*
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
1
-0
/
+6
|
|
\
|
|
|
*
expert option to treat vibrate as silent mode for XA. fixes #1530
Daniel Gultsch
2016-03-01
1
-0
/
+6
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-07
1
-7
/
+0
|
\
|
|
|
*
|
Finally fixes FS#142
lookshe
2016-03-07
1
-7
/
+0
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
1
-55
/
+83
|
\
|
|
|
*
|
Fixes FS#147: Disable OMEMO
steckbrief
2016-03-02
1
-1
/
+6
|
*
|
Fixes FS#146: Remove Tor-Support
steckbrief
2016-03-02
1
-6
/
+1
|
*
|
Merge tag '1.10.1' into trz/merge_1.10.1
steckbrief
2016-02-28
1
-1
/
+0
|
|
\
|
|
|
*
disallow message correction by default. fixes #1720
Daniel Gultsch
2016-02-26
1
-1
/
+1
|
*
|
Removed stupid message correction
steckbrief
2016-02-23
1
-5
/
+0
|
*
|
Merge tag '1.10.0' into trz/merge_1.10.0
lookshe
2016-02-22
1
-1
/
+6
|
|
\
|
|
|
*
added setting to opt-out of message correction. renamed preferences and optio...
Daniel Gultsch
2016-02-16
1
-1
/
+6
|
*
|
Unused preference 'picture_compression'. This feature is configured in our va...
steckbrief
2016-02-13
1
-7
/
+0
|
*
|
green bubbles and setting to choose green or white bubbles removed
steckbrief
2016-02-12
1
-5
/
+0
|
*
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-55
/
+96
|
|
\
|
|
|
*
opt out handling of the autojoin flag. fixes #1666
Daniel Gultsch
2016-02-01
1
-0
/
+6
|
|
*
expert setting to trigger extended connection options
Daniel Gultsch
2016-01-25
1
-0
/
+5
|
|
*
let the user decide on whether or not to compress pictures
Daniel Gultsch
2016-01-09
1
-10
/
+16
|
|
*
show per conference notification settings in details activity
Daniel Gultsch
2016-01-08
1
-6
/
+0
|
|
*
introduced build-time paranoia mode that disables unencrypted chats and force...
Daniel Gultsch
2015-12-01
1
-1
/
+3
|
|
*
initial tor support
Daniel Gultsch
2015-12-01
1
-0
/
+7
|
|
*
introduced expert options to set status to away and xa if screen is off or if...
Daniel Gultsch
2015-10-08
1
-0
/
+12
|
|
*
Export logs to SD card preference
fiaxh
2015-09-21
1
-0
/
+4
|
|
*
added setting to allow for white backgrounds in incoming message bubbles
Daniel Gultsch
2015-08-24
1
-0
/
+5
|
|
*
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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
1
-19
/
+30
|
|
\
\
|
|
/
/
|
/
|
|
|
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-0
/
+3
|
|
\
\
|
*
\
\
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
1
-0
/
+8
|
|
\
\
\
*
|
|
|
|
Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...
steckbrief
2015-12-16
1
-19
/
+30
|
|
_
|
/
/
|
/
|
|
|
*
|
|
|
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
1
-0
/
+3
|
|
/
/
|
/
|
|
*
|
|
Implements FS#24: Introduce setting for picture resizing
steckbrief
2015-10-30
1
-0
/
+8
*
|
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
1
-2
/
+24
|
\
|
|
|
*
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-2
/
+24
*
|
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-3
/
+3
|
/
/
*
|
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
|
\
\
[next]