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
/
adapter
/
ConversationAdapter.java
(
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
/
+4
|
\
|
*
properly cancel avatar tasks
Daniel Gultsch
2016-04-29
1
-2
/
+3
*
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-06
1
-1
/
+2
|
\
\
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-04-01
1
-1
/
+6
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-30
1
-1
/
+3
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-20
/
+9
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-29
1
-1
/
+2
|
\
|
|
*
|
|
Changed access to presences according to new Presence representation in C
steckbrief
2016-02-23
1
-5
/
+5
*
|
|
Implements FS#64: Show who wrote last message in conversation overview
steckbrief
2016-02-13
1
-2
/
+13
*
|
|
Imports organized
steckbrief
2016-02-12
1
-18
/
+2
*
|
|
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-16
/
+21
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
show per conference notification settings in details activity
Daniel Gultsch
2016-01-08
1
-1
/
+4
|
*
|
show icon in conversations overview when notifications are disabled
Daniel Gultsch
2016-01-08
1
-0
/
+12
|
*
|
added some key binding
Daniel Gultsch
2015-09-07
1
-1
/
+1
|
*
|
Optimize imports
Andreas Straub
2015-07-20
1
-1
/
+1
|
*
|
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
1
-3
/
+3
|
*
|
made httpconnection (download) ready all kind of files
feature/http_upload
Daniel Gultsch
2015-06-30
1
-2
/
+1
|
*
|
fixed regression where the selected conversation wasn't highlighted anymore o...
iNPUTmice
2015-04-13
1
-11
/
+4
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-15
1
-2
/
+12
|
\
\
\
|
|
|
/
|
|
/
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-01-13
1
-3
/
+4
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
1
-1
/
+1
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-1
/
+1
|
\
|
|
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-03
1
-1
/
+1
|
\
|
|
*
|
|
Merge trz/rename into trz/rebase
steckbrief
2015-10-22
1
-1
/
+2
|
\
|
|
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2015-10-05
1
-6
/
+10
|
\
|
|
|
*
|
renaming eu.siacs.conversations to de.thedevstack.conversationsplus
steckbrief
2015-06-19
1
-237
/
+0
*
|
|
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
lookshe
2015-08-16
1
-2
/
+1
*
|
|
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-16
/
+8
|
/
/
*
|
changed last message in overview also to EmojiconTextView for displaying smil...
lookshe
2015-04-12
1
-1
/
+3
*
|
show online status under avatar in same way for muc as the send button does
lookshe
2015-04-11
1
-13
/
+18
*
|
Changes for emoticon parser reactivated
steckbrief
2015-03-31
1
-1
/
+3
*
|
Merge tag '1.2.0' into trz/master
steckbrief
2015-03-30
1
-3
/
+92
|
\
|
|
*
properly remove invalid avatar
iNPUTmice
2015-02-22
1
-0
/
+1
|
*
always call to cancel before loading new avatars
iNPUTmice
2015-02-18
1
-12
/
+14
|
*
made image view background more colorful while waiting on actual avatar to load
iNPUTmice
2015-02-15
1
-1
/
+1
|
*
loading avatars in seperate tasks
iNPUTmice
2015-02-15
1
-2
/
+88
*
|
Merge master-origin
steckbrief
2015-02-20
1
-93
/
+41
|
\
|
|
*
fixed missing image preview
iNPUTmice
2015-01-20
1
-1
/
+1
|
*
reworked message preview / message meta information (ie file offered, receive...
Daniel Gultsch
2015-01-12
1
-91
/
+32
|
*
Add XEP-0245 (/me command) support
Sam Whited
2015-01-11
1
-9
/
+10
*
|
- Avoiding accessing shared preferences to know if emoticons should be parsed...
steckbrief
2015-01-20
1
-3
/
+25
*
|
Setting added for parsing emoticons or not
Tristan Zur
2015-01-11
1
-1
/
+4
*
|
Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter fo...
Tristan Zur
2015-01-10
1
-1
/
+2
*
|
Merge branch 'master' of ssh://git.fucktheforce.de/conversations
lookshe
2015-01-03
1
-10
/
+9
|
\
|
|
*
Add support for XEP-0191 (Blocking command)
Sam Whited
2014-12-22
1
-9
/
+9
|
*
cleanup: removed unused emoticon parsing
iNPUTmice
2014-12-09
1
-5
/
+1
*
|
remaining part of my patch
lookshe
2015-01-03
1
-3
/
+2
|
/
*
fixed description in notifications and conversation overview
iNPUTmice
2014-11-15
1
-1
/
+11
*
adepted conversationadapter to deal with files
iNPUTmice
2014-11-15
1
-3
/
+21
*
Update more files to use JID objects
Sam Whited
2014-11-09
1
-1
/
+1
[next]
