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
*
fixe race conditons with newIntent
iNPUTmice
2014-07-27
1
-19
/
+17
*
migrated some ArrayLists to CopyOnWriteArrayLists
iNPUTmice
2014-07-27
6
-22
/
+14
*
fixed npe with unsuccesfull bind
iNPUTmice
2014-07-26
1
-18
/
+25
*
fixed npe when user was very quick with starting to type in startConversation...
iNPUTmice
2014-07-26
1
-2
/
+4
*
added swedish translation by @andersruneson
iNPUTmice
2014-07-26
3
-0
/
+294
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-07-26
1
-2
/
+32
|
\
|
*
Merge pull request #315 from jelmer/dutch
Daniel Gultsch
2014-07-26
1
-2
/
+32
|
|
\
|
|
*
Update Dutch translations.
Jelmer Vernooij
2014-07-26
1
-2
/
+32
|
|
/
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-07-25
2
-60
/
+90
|
\
|
|
*
Merge pull request #313 from suraia/translation-de
Daniel Gultsch
2014-07-25
2
-60
/
+90
|
|
\
|
|
*
Update German translation.
Michael Kuhn
2014-07-24
2
-60
/
+90
|
|
/
*
/
version bump to 0.5
0.5
iNPUTmice
2014-07-24
1
-2
/
+2
|
/
*
Merge pull request #312 from beriain/development
Daniel Gultsch
2014-07-24
1
-2
/
+2
|
\
|
*
Some corrections
Aitor Beriain
2014-07-24
1
-2
/
+2
|
/
*
updated screenshots
iNPUTmice
2014-07-24
1
-0
/
+0
*
removed duplicates from muc suggestions
iNPUTmice
2014-07-24
2
-6
/
+7
*
included version string in crash reports
iNPUTmice
2014-07-24
1
-6
/
+17
*
french translations by @BenoitBouvarel fixed #311
iNPUTmice
2014-07-24
1
-7
/
+20
*
fixed spanish string. wild guessed + google translate fix for basque
iNPUTmice
2014-07-24
2
-2
/
+2
*
added some translations back that have been removed be accident
iNPUTmice
2014-07-24
7
-7
/
+21
*
Merge branch 'rostovtsev-development' into development
iNPUTmice
2014-07-24
1
-0
/
+12
|
\
|
*
Merge branch 'development' of https://github.com/rostovtsev/Conversations int...
iNPUTmice
2014-07-24
1
-0
/
+12
|
/
|
|
*
Update strings.xml
Ilia
2014-07-24
1
-2
/
+2
|
*
Added translations
Ilia
2014-07-24
1
-0
/
+14
*
|
added jelmer to the list of translators
iNPUTmice
2014-07-24
1
-0
/
+1
*
|
removed more legacy tls error handling stuff
iNPUTmice
2014-07-24
3
-9
/
+0
*
|
removed outdated tls error
iNPUTmice
2014-07-24
3
-11
/
+2
*
|
removed outdated translations from languge files
iNPUTmice
2014-07-24
8
-108
/
+2
*
|
presonalized read up to this point message
iNPUTmice
2014-07-24
2
-11
/
+8
*
|
answer correctly if both markers and receipts are requested
iNPUTmice
2014-07-24
2
-13
/
+17
*
|
fixed bug with otr session being initilized over and over again
iNPUTmice
2014-07-23
2
-11
/
+11
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-07-23
1
-13
/
+13
|
\
\
|
*
\
Merge pull request #307 from Erkan-Yilmaz/development
Daniel Gultsch
2014-07-23
1
-13
/
+13
|
|
\
\
|
|
*
|
typos
Erkan Yilmaz
2014-07-23
1
-13
/
+13
|
|
/
/
*
/
/
more disco. fixed chat markers with jappix
iNPUTmice
2014-07-23
6
-18
/
+99
|
/
/
*
|
updated mtm
iNPUTmice
2014-07-22
1
-0
/
+0
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-07-22
1
-0
/
+3
|
\
\
|
*
\
Merge pull request #303 from kruks23/development
Daniel Gultsch
2014-07-22
1
-0
/
+3
|
|
\
\
|
|
*
|
Update Spanish Translations
kruks23
2014-07-22
1
-0
/
+3
*
|
|
|
some cleanup
iNPUTmice
2014-07-22
2
-43
/
+0
|
/
/
/
*
/
/
switched to mtm
iNPUTmice
2014-07-22
7
-142
/
+32
|
/
/
*
|
brought settings and manage account menu items back
iNPUTmice
2014-07-22
2
-8
/
+4
*
|
fixed #301
iNPUTmice
2014-07-22
1
-1
/
+2
*
|
refactored message adapter into seperate class
Daniel Gultsch
2014-07-22
3
-445
/
+498
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2014-07-22
1
-14
/
+39
|
\
\
|
*
\
Merge pull request #299 from beriain/development
Daniel Gultsch
2014-07-22
1
-14
/
+39
|
|
\
\
|
|
*
|
Update strings.xml
Aitor Beriain
2014-07-22
1
-14
/
+39
*
|
|
|
Merge branch 'master' into development
Daniel Gultsch
2014-07-22
2
-3
/
+8
|
\
\
\
\
|
|
/
/
/
|
/
|
|
|
|
*
|
|
version bump to 0.5-beta and changelog
0.5-beta
iNPUTmice
2014-07-21
2
-3
/
+8
*
|
|
|
save login nick for mucs during join
iNPUTmice
2014-07-21
1
-0
/
+5
|
/
/
/
[next]