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
...
|
*
prevent previoulsly cleared messages from reloading. fixes #1110
Daniel Gultsch
2016-02-04
9
-17
/
+92
|
*
add more fault tolerant checks for messages left on server
Daniel Gultsch
2016-02-04
3
-7
/
+21
|
*
removed unecessary logging when muc tiles update
Daniel Gultsch
2016-02-04
1
-1
/
+0
|
*
use TLSv1.2 as SSL context on supported plattforms
Daniel Gultsch
2016-02-03
3
-2
/
+14
|
*
cache server caps
Daniel Gultsch
2016-02-03
3
-3
/
+36
|
*
count all messages in a query
Daniel Gultsch
2016-02-03
2
-8
/
+3
|
*
Revert "get rid of broken totalMessageCount for mam queries"
Daniel Gultsch
2016-02-03
2
-4
/
+16
|
*
refactored disco cache. avoid making duplicate call. check hash
Daniel Gultsch
2016-02-03
6
-43
/
+116
|
*
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...
Daniel Gultsch
2016-02-02
11
-152
/
+467
|
|
\
|
|
*
Do disco for caps hashes we have never seen
Stephen Paul Weber
2016-01-24
1
-2
/
+23
|
|
*
Fetch cached caps result on new presence
Stephen Paul Weber
2016-01-24
2
-3
/
+14
|
|
*
Use a Presence class for presence information
Stephen Paul Weber
2016-01-24
8
-102
/
+121
|
|
*
Persisitence and loading for ServiceDiscoveryResult
Stephen Paul Weber
2016-01-23
2
-11
/
+98
|
|
*
Implement toJSON on ServiceDiscoveryResult
Stephen Paul Weber
2016-01-23
1
-0
/
+34
|
|
*
Generate capHash from any discovery result
Stephen Paul Weber
2016-01-23
1
-4
/
+80
|
|
*
Factor out a representation of XEP-0030 results
Stephen Paul Weber
2016-01-23
2
-47
/
+114
|
*
|
fixed 'unencrypted' not showing up for conferences when encryption is forced
Daniel Gultsch
2016-02-02
1
-1
/
+1
|
*
|
get rid of broken totalMessageCount for mam queries
Daniel Gultsch
2016-02-02
2
-16
/
+4
|
*
|
re-read common name from certificates on startup
Daniel Gultsch
2016-02-02
2
-2
/
+32
|
*
|
avoid npe when accessing the pgp connection service
Daniel Gultsch
2016-02-02
1
-1
/
+1
|
*
|
catch a few NPE when parsing invalid pep nodes
Daniel Gultsch
2016-02-02
1
-3
/
+3
*
|
|
Fixes FS#105: XHTML par for images added
trz/merge_1.9.3
steckbrief
2016-02-13
1
-0
/
+12
*
|
|
Fix flagging no more messages on server for conversation
steckbrief
2016-02-13
1
-16
/
+18
*
|
|
Implements FS#64: Show who wrote last message in conversation overview
steckbrief
2016-02-13
1
-2
/
+13
*
|
|
Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevs...
steckbrief
2016-02-13
1
-2
/
+2
*
|
|
Fixes FS#135: condition NOT message.isRead() added to check if notification s...
steckbrief
2016-02-13
1
-1
/
+1
*
|
|
Unused preference 'picture_compression'. This feature is configured in our va...
steckbrief
2016-02-13
20
-56
/
+0
*
|
|
Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...
steckbrief
2016-02-13
6
-79
/
+5
*
|
|
Fixed settings synchronization
steckbrief
2016-02-12
1
-60
/
+66
*
|
|
Imports organized
steckbrief
2016-02-12
73
-293
/
+56
*
|
|
Fixed parent activity for logoutput activity
steckbrief
2016-02-12
1
-3
/
+3
*
|
|
Simplification of DNS requests.
steckbrief
2016-02-12
3
-254
/
+130
*
|
|
green bubbles and setting to choose green or white bubbles removed
steckbrief
2016-02-12
24
-67
/
+5
*
|
|
Fixed placeholder string for message input box
steckbrief
2016-02-12
2
-2
/
+2
*
|
|
Fixed layout issue with emojicon tastatur button
steckbrief
2016-02-12
1
-1
/
+0
*
|
|
Fixed NPE while loading messages via MAM
steckbrief
2016-02-12
1
-1
/
+1
*
|
|
Fixed runtime errors with axolotl libraries.
steckbrief
2016-02-12
6
-0
/
+1
*
|
|
database error while upgrading from db version 14 fixed
steckbrief
2016-02-12
1
-1
/
+1
*
|
|
axolotl resources changed from maven to jcenter
steckbrief
2016-02-12
5
-2
/
+2
*
|
|
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
24
-728
/
+358
*
|
|
Some runtime dependencies added
steckbrief
2016-02-11
3
-1
/
+4
*
|
|
Fixed XML errors after merge
steckbrief
2016-02-11
6
-8
/
+14
*
|
|
Fixed third party library references in gradle
steckbrief
2016-02-11
26
-54
/
+11
*
|
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
326
-7202
/
+20503
|
\
|
|
|
*
|
version bump to 1.9.3
1.9.3
Daniel Gultsch
2016-02-01
2
-2
/
+8
|
*
|
respect autojoin setting on newly created bookmarks as well
Daniel Gultsch
2016-02-01
1
-1
/
+1
|
*
|
opt out handling of the autojoin flag. fixes #1666
Daniel Gultsch
2016-02-01
5
-5
/
+20
|
*
|
Merge branch 'master' of github.com:siacs/Conversations
Daniel Gultsch
2016-02-01
1
-1
/
+1
|
|
\
\
|
|
*
|
Update README.md
Daniel Gultsch
2016-01-31
1
-1
/
+1
|
*
|
|
made create context menu call in StartConversationsActivity more failsafe
Daniel Gultsch
2016-02-01
1
-1
/
+1
[prev]
[next]