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
/
res
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge branch 'development' of github.com:siacs/Conversations into development
iNPUTmice
2014-09-07
12
-121
/
+0
|
\
|
*
deleted some unused string-resources and imports, also deleted edit_account_d...
Michael
2014-09-07
12
-121
/
+0
*
|
fixed #321 - delete otr fingerprints
iNPUTmice
2014-09-07
6
-14
/
+34
|
/
*
made otr a little bit more solid when there is no presence subscription
iNPUTmice
2014-09-06
1
-0
/
+1
*
warn user if no presence subscription exists
iNPUTmice
2014-09-05
1
-0
/
+3
*
added support for password protected muc - fixed #203 and fixed #395
iNPUTmice
2014-09-03
1
-0
/
+2
*
added ability to disable notifications for specific conversations - fixed #322
iNPUTmice
2014-09-03
3
-0
/
+23
*
Merge branch 'unused_resources' of https://github.com/betheg/Conversations in...
iNPUTmice
2014-09-02
11
-496
/
+0
|
\
|
*
removed unused string resources.
Michael
2014-09-01
11
-496
/
+0
*
|
fixed #410 by removing that config option
iNPUTmice
2014-09-02
1
-8
/
+0
*
|
refactored share with activity
iNPUTmice
2014-09-02
2
-46
/
+20
|
/
*
Merge pull request #401 from jelmer/dutch-updates
Daniel Gultsch
2014-08-31
1
-0
/
+33
|
\
|
*
Update Dutch translations.
Jelmer Vernooij
2014-08-31
1
-0
/
+33
*
|
Merge pull request #398 from betheg/fix_res
Daniel Gultsch
2014-08-31
9
-17
/
+13
|
\
\
|
*
|
fix: warning: string 'publish_avatar' has no default translation.
Michael
2014-08-30
9
-17
/
+13
|
|
/
*
/
experimental message merging
iNPUTmice
2014-08-31
1
-0
/
+5
|
/
*
more swedish translations
iNPUTmice
2014-08-29
1
-0
/
+3
*
fixed #389
iNPUTmice
2014-08-29
4
-4
/
+4
*
Fix some typos in the German translation.
Michael Kuhn
2014-08-28
1
-19
/
+19
*
fixed spelling thanks @betheg
iNPUTmice
2014-08-28
2
-43
/
+39
*
formating in strings file
iNPUTmice
2014-08-28
1
-3
/
+3
*
Merge branch 'development' of https://github.com/beriain/Conversations into d...
iNPUTmice
2014-08-28
1
-12
/
+20
|
\
|
*
Update strings.xml
Aitor Beriain
2014-08-27
1
-20
/
+20
*
|
translated missing string in settings
iNPUTmice
2014-08-27
4
-42
/
+33
*
|
added swedish translations by Anders Sandblad @andersruneson
iNPUTmice
2014-08-27
1
-1
/
+24
*
|
added missing string to german translation
iNPUTmice
2014-08-26
1
-0
/
+1
*
|
Updated to 0.6.1
Ilia
2014-08-26
1
-23
/
+59
*
|
removed deprecated strings from translations
iNPUTmice
2014-08-26
6
-49
/
+1
*
|
Merge pull request #376 from wapolinar/development
Daniel Gultsch
2014-08-25
1
-1
/
+1
|
\
\
|
*
|
Update strings.xml
wapolinar
2014-08-25
1
-1
/
+1
*
|
|
Update Spanish Translations
kruks23
2014-08-25
1
-11
/
+6
|
/
/
*
|
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch
2014-08-24
1
-11
/
+12
|
\
\
|
*
|
Update strings.xml
kriztan
2014-08-24
1
-11
/
+12
*
|
|
jump right into edit account if now accounts are configured
Daniel Gultsch
2014-08-23
1
-1
/
+1
*
|
|
changed workflow on inital avatar publication
Daniel Gultsch
2014-08-23
1
-0
/
+1
|
/
/
*
|
removed server compat value in favor of a (small xep list)
Daniel Gultsch
2014-08-23
2
-136
/
+164
*
|
Merge pull request #373 from kruks23/translation1
Daniel Gultsch
2014-08-23
1
-3
/
+10
|
\
\
|
*
|
Update Spanish Translations
kruks23
2014-08-21
1
-3
/
+10
*
|
|
tiny redesign for private muc messages
iNPUTmice
2014-08-22
1
-2
/
+2
|
/
/
*
|
added missing string resource again
iNPUTmice
2014-08-20
1
-0
/
+2
*
|
revised manage account activity. removed contexual action mode
iNPUTmice
2014-08-20
4
-65
/
+50
*
|
better error display and additional infos (stats) for the edit account activity
iNPUTmice
2014-08-19
3
-166
/
+74
*
|
Merge pull request #365 from beriain/development
Daniel Gultsch
2014-08-19
1
-3
/
+19
|
\
|
|
*
Update strings.xml
Aitor Beriain
2014-08-18
1
-3
/
+19
*
|
Update strings.xml
kriztan
2014-08-17
1
-0
/
+1
*
|
moved add/edit account from dialog into seperate activity
iNPUTmice
2014-08-15
2
-1
/
+109
*
|
Update strings.xml
kriztan
2014-08-15
1
-1
/
+1
*
|
Update strings.xml
kriztan
2014-08-15
1
-17
/
+28
*
|
Add Hebrew translation.
GreenLunar
2014-08-14
1
-0
/
+284
*
|
Add Hebrew translation.
GreenLunar
2014-08-14
1
-0
/
+22
[next]