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
/
libs
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
lookshe
2015-08-16
20
-0
/
+115
*
Merged https://github.com/ankushsachdeva/emojicon/pull/16
lookshe
2015-08-15
1
-4
/
+24
*
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
2
-2
/
+2
*
moved color picker to libs
lookshe
2015-04-15
34
-0
/
+852
*
whatsapp-like smiley implementation
lookshe
2015-04-12
1018
-0
/
+4064
*
Merge master-origin
steckbrief
2015-02-20
23
-2948
/
+0
|
\
|
*
Switch to maven central minidns
Rene Treffer
2015-01-14
23
-2948
/
+0
*
|
changes to get it working under eclipse
lookshe
2015-01-10
9
-0
/
+30
|
/
*
update android gradle plugin to 0.14.4
Michael
2014-11-22
1
-2
/
+5
*
Subtree merged in openpgp api lib
Sam Whited
2014-10-28
45
-6
/
+1829
*
Subtree merged in minidns
Sam Whited
2014-10-28
23
-0
/
+2945
*
Remove minidns dir
Sam Whited
2014-10-28
1
-6
/
+0
*
Subtree merged in MemorizingTrustManager
Sam Whited
2014-10-28
35
-0
/
+1875
*
Move submodules back to libs/
Sam Whited
2014-10-26
3
-0
/
+12
*
Pull otr4j form Maven repo
Sam Whited
2014-10-26
1
-0
/
+0
*
Suppress lint errors and remove bcprov
Sam Whited
2014-10-22
1
-0
/
+0
*
Add build deps and move build props to build file
Sam Whited
2014-10-22
2
-0
/
+0