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
Commit message (
Expand
)
Author
Age
Files
Lines
*
more bug fixes for the pgp problem
iNPUTmice
2014-06-04
1
-49
/
+73
*
fixed pgp on incoming carbon messages
iNPUTmice
2014-06-04
2
-19
/
+17
*
Merge branch 'feature/xep-0333' into development
iNPUTmice
2014-06-03
5
-16
/
+76
|
\
|
*
answer to xep 184 message receipts. fixes #95
iNPUTmice
2014-06-03
5
-16
/
+76
*
|
Merge pull request #176 from imaginator/patch-1
Daniel Gultsch
2014-06-03
1
-1
/
+1
|
\
\
|
|
/
|
/
|
|
*
small type
Simon Tennant
2014-06-03
1
-1
/
+1
|
/
*
version bump to 0.3
0.3
iNPUTmice
2014-06-03
2
-2
/
+4
*
added pgp sig on muc rename
iNPUTmice
2014-06-03
1
-3
/
+9
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-06-02
8
-8
/
+8
|
\
|
*
Merge pull request #169 from alethea/self-typo
Daniel Gultsch
2014-06-02
8
-8
/
+8
|
|
\
|
|
*
Fixed typo in source "sefl" -> "self"
Alethea Rose Butler
2014-06-01
8
-8
/
+8
|
|
/
*
/
long press on images revails share with intent
iNPUTmice
2014-06-02
1
-0
/
+13
|
/
*
version bump
0.3-beta
iNPUTmice
2014-06-01
1
-2
/
+2
*
updated changelog and readme for the 0.3 release
iNPUTmice
2014-06-01
2
-0
/
+20
*
linked openkeychain install dialog from decrypt messages box
iNPUTmice
2014-06-01
1
-49
/
+62
*
changed roster to concurrent hashmap
iNPUTmice
2014-06-01
1
-2
/
+2
*
unified crypto messages and made lock icon work for conferences
iNPUTmice
2014-06-01
3
-23
/
+18
*
added warning when public keys are missing
iNPUTmice
2014-06-01
2
-0
/
+7
*
Merge pull request #168 from strb/mucicons
Daniel Gultsch
2014-06-01
1
-1
/
+1
|
\
|
*
Fix tile rendering for larger conferences
Andreas Straub
2014-06-01
1
-1
/
+1
|
/
*
show dialog when no contact in a muc has pgp support
iNPUTmice
2014-06-01
4
-6
/
+44
*
OpenPGP key display in muc details is now prettier and linked to openkeychain
iNPUTmice
2014-06-01
3
-9
/
+46
*
Merge pull request #167 from alethea/up-navigation
Daniel Gultsch
2014-06-01
3
-8
/
+24
|
\
|
*
Removed TASK_ON_HOME flag from intent created from share
Alethea Butler
2014-05-31
1
-1
/
+3
|
*
Made the navigateUp override behave like a navigate up
Alethea Butler
2014-05-31
1
-1
/
+9
|
*
Refactored into onNavigateUp
Alethea Butler
2014-05-31
1
-6
/
+11
|
*
Made ConversationActivity singleTask
Alethea Butler
2014-05-31
1
-1
/
+2
|
/
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-05-31
14
-69
/
+113
|
\
|
*
Merge pull request #164 from alethea/development
Daniel Gultsch
2014-05-31
3
-0
/
+11
|
|
\
|
|
*
Up button goes to contacts after initial setup
Alethea Butler
2014-05-30
1
-0
/
+6
|
|
*
Disabled the Home button when it's not the Up button
Alethea Butler
2014-05-30
3
-0
/
+5
|
*
|
Merge pull request #165 from alethea/openpgp-capitalization
Daniel Gultsch
2014-05-31
7
-39
/
+39
|
|
\
\
|
|
|
/
|
|
/
|
|
|
*
Capitalized openPGP -> OpenPGP
Alethea Butler
2014-05-31
7
-39
/
+39
|
|
/
|
*
Merge pull request #153 from 9034725985/patch-1
Daniel Gultsch
2014-05-30
1
-1
/
+1
|
|
\
|
|
*
Update README.md
Kushal
2014-05-26
1
-1
/
+1
|
*
|
Merge pull request #160 from alethea/development
Daniel Gultsch
2014-05-30
1
-2
/
+2
|
|
\
\
|
|
*
|
Changed "unsuccessful delivery" to "delivery failed"
Alethea Butler
2014-05-30
1
-1
/
+1
|
|
*
|
Added question mark to remove_contact_text
Alethea Butler
2014-05-30
1
-1
/
+1
|
*
|
|
Merge pull request #157 from kruks23/development
Daniel Gultsch
2014-05-30
6
-27
/
+60
|
|
\
\
\
|
|
|
/
/
|
|
/
|
|
|
|
*
|
More harcoded translations + updated Spanish
kruks23
2014-05-29
6
-27
/
+60
|
|
/
/
*
/
/
fixed regression that led to the wakelock not being released again
iNPUTmice
2014-05-31
1
-1
/
+1
|
/
/
*
|
display pgp key id in muc details and use keys to encrypt groupchat
Daniel Gultsch
2014-05-28
3
-4
/
+29
*
|
encrypted group messages are now properly decrypted
Daniel Gultsch
2014-05-28
2
-7
/
+11
*
|
first tries on crypto muc
Daniel Gultsch
2014-05-28
6
-41
/
+80
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-05-28
2
-4
/
+50
|
\
|
|
*
Merge pull request #147 from kruks23/development
Daniel Gultsch
2014-05-26
1
-2
/
+2
|
|
\
|
|
*
Fix Contact Status width in contact details
kruks23
2014-05-24
1
-2
/
+2
|
*
|
Merge pull request #152 from beriain/development
Daniel Gultsch
2014-05-26
1
-2
/
+48
|
|
\
\
|
|
*
|
Update strings.xml
Aitor Beriain
2014-05-26
1
-13
/
+13
|
|
*
|
Update strings.xml
Aitor Beriain
2014-05-26
1
-2
/
+48
[next]
