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
/
AndroidManifest.xml
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)
trz/merge_1.12.4
lookshe
2016-05-26
1
-3
/
+19
|
\
|
*
expert setting to manually change presence
Daniel Gultsch
2016-04-22
1
-0
/
+6
|
*
added magic create welcome screen
Daniel Gultsch
2016-04-19
1
-3
/
+13
*
|
fixed installation error "W/PackageManager: Can't install because provider na...
trz/beta-1
lookshe
2016-04-03
1
-1
/
+1
*
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-27
1
-0
/
+9
|
\
\
|
*
|
Fixes FS#166 - Images cannot be opened since storing in private image folder
lookshe
2016-03-27
1
-0
/
+9
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-06
1
-71
/
+94
|
|
\
\
|
|
/
/
|
/
|
|
*
|
|
Fixed parent activity for logoutput activity
steckbrief
2016-02-12
1
-3
/
+3
*
|
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-54
/
+77
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
ask to be excluded from battery optimization
Daniel Gultsch
2016-01-11
1
-0
/
+1
|
*
|
implement direct sharing in android 6.0. fixes #1321
Daniel Gultsch
2015-12-07
1
-0
/
+9
|
*
|
users are now able to crop their avatar pictures using the android-crop
Philip Flohr
2015-12-02
1
-1
/
+1
|
*
|
pgp fixes and revert configuration changes
Daniel Gultsch
2015-11-25
1
-5
/
+0
|
*
|
Handle some orientation changes manually
saqura
2015-10-25
1
-0
/
+4
|
*
|
open manage account + certificate chooser when cbe mode is enabled
Daniel Gultsch
2015-10-20
1
-60
/
+65
|
*
|
introduced expert options to set status to away and xa if screen is off or if...
Daniel Gultsch
2015-10-08
1
-0
/
+1
|
*
|
Export logs to SD card preference
fiaxh
2015-09-21
1
-0
/
+1
|
*
|
single task mode for start conversations activity
Daniel Gultsch
2015-08-30
1
-0
/
+1
|
*
|
remove the READ_PHONE_STATE permission.
Michael
2015-08-23
1
-0
/
+2
|
*
|
renamed multi-end / axolotl to OMEMO
Daniel Gultsch
2015-08-08
1
-1
/
+1
|
*
|
Ask for key trust when sending messages
Andreas Straub
2015-07-19
1
-0
/
+4
|
*
|
allow sharing multiple images at once. fixes #1090
iNPUTmice
2015-04-11
1
-0
/
+7
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
1
-1
/
+1
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Moved logcat to a module, increased error robustness for loading last messages
steckbrief
2015-12-10
1
-1
/
+1
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-0
/
+8
|
\
|
|
|
*
|
Implements FS#67: Introduce central logging class to use log prefix, new acti...
steckbrief
2015-11-20
1
-0
/
+8
*
|
|
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
*
|
|
fix imports and namespaces
steckbrief
2015-10-05
1
-1
/
+1
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-10-05
1
-1
/
+2
|
\
|
|
|
*
|
Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...
steckbrief
2015-10-05
1
-1
/
+2
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2015-08-11
1
-0
/
+7
|
|
\
\
|
|
/
/
|
/
|
|
|
*
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-19
/
+19
|
|
/
*
/
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-0
/
+7
|
/
*
Remove title_activity_conversations and use app_name instead
kruks23
2015-01-30
1
-2
/
+2
*
migrated change password into separate activity
Daniel Gultsch
2015-01-03
1
-0
/
+3
*
Add support for XEP-0191 (Blocking command)
Sam Whited
2014-12-22
1
-0
/
+3
*
Allow sending of any filetype via intent
Sam Whited
2014-12-15
1
-1
/
+1
*
initial smp support
iNPUTmice
2014-11-11
1
-0
/
+4
*
use proper theme for MTM
iNPUTmice
2014-11-09
1
-4
/
+8
*
Convert about dialog to activity
Sam Whited
2014-11-04
1
-23
/
+33
*
fixed merge error
nfc
iNPUTmice
2014-11-03
1
-1
/
+0
*
Merge branch 'nfc' of https://github.com/siacs/Conversations into nfc
iNPUTmice
2014-11-03
1
-0
/
+1
|
\
|
*
basic beam code / untested
iNPUTmice
2014-11-03
1
-22
/
+20
*
|
use different filter for nfc intents
iNPUTmice
2014-11-03
1
-1
/
+1
*
|
basic beam code / untested
iNPUTmice
2014-11-03
1
-22
/
+20
|
/
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+118
