aboutsummaryrefslogtreecommitdiffstats
path: root/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #299 from beriain/developmentDaniel Gultsch2014-07-221-14/+39
|\
| * Update strings.xmlAitor Beriain2014-07-221-14/+39
* | added hint to explain the contact has read up to this pointiNPUTmice2014-07-211-0/+1
* | fixed #267iNPUTmice2014-07-211-0/+2
* | fixed typos reported by @jelmer fixed #288iNPUTmice2014-07-201-2/+2
* | Merge pull request #289 from jelmer/dutchDaniel Gultsch2014-07-203-0/+294
|\ \
| * | Add Dutch translations.Jelmer Vernooij2014-07-203-0/+294
* | | Update Spanish Translationskruks232014-07-182-5/+5
* | | show snackbar if conference was not foundiNPUTmice2014-07-181-0/+2
* | | brought muc invites back. + couple of bug fixes + refactoringiNPUTmice2014-07-175-28/+42
* | | Update Spanish Translationskruks232014-07-161-1/+6
* | | redesigned muc details a little bitiNPUTmice2014-07-1612-161/+142
* | | Merge pull request #278 from rostovtsev/developmentDaniel Gultsch2014-07-153-4/+297
|\ \ \
| * | | Russian LocalizationIlia2014-07-161-0/+22
| * | | Double-checked Russian localizationIlia2014-07-161-196/+196
| * | | Fixed typo Ouf -> OutIlia2014-07-151-1/+1
| * | | Fixed typo mange -> manageIlia2014-07-151-1/+1
| * | | Fixed typo Decrpytion -> DecryptionIlia2014-07-151-2/+2
| * | | Update strings.xmlIlia2014-07-151-86/+85
| * | | Russian Translation for ConversationsIlia2014-07-151-0/+272
| * | | Delete values-ruIlia2014-07-151-272/+0
| * | | strings.xmlIlia2014-07-151-0/+272
* | | | added confirm dialog before contact and bookmark removaliNPUTmice2014-07-151-1/+2
|/ / /
* | | Merge pull request #275 from BenoitBouvarel/developmentDaniel Gultsch2014-07-151-4/+22
|\ \ \
| * | | Update strings.xmlBenoit Bouvarel2014-07-151-4/+22
* | | | pushing bookmarks back to serveriNPUTmice2014-07-151-0/+1
* | | | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-141-1/+5
|\ \ \ \
| * | | | Update Spanish Translationskruks232014-07-131-1/+5
* | | | | fetch bookmarks from serveriNPUTmice2014-07-143-1/+14
|/ / / /
* | | | fixed #268iNPUTmice2014-07-121-0/+0
* | | | switch SearchView with custom action viewiNPUTmice2014-07-112-1/+20
* | | | added join conference dialogiNPUTmice2014-07-114-5/+56
* | | | cleanup. removed old contacts activity. WARNING: this will temporarly disable...iNPUTmice2014-07-113-92/+0
* | | | fixed #255 and made some other improvements to the subscription mgmtiNPUTmice2014-07-111-12/+0
* | | | Merge pull request #262 from kruks23/developmentDaniel Gultsch2014-07-111-3/+16
|\ \ \ \
| * | | | Update Spanish Translationskruks232014-07-101-3/+16
* | | | | fixed #38iNPUTmice2014-07-102-6/+4
|/ / / /
* | | | added create contact dialogiNPUTmice2014-07-102-3/+42
* | | | added contextual menu for contactsiNPUTmice2014-07-102-0/+16
* | | | small changesiNPUTmice2014-07-102-9/+12
* | | | theming for tabs in start conversationiNPUTmice2014-07-1026-12/+34
* | | | filter contacts and starting confercenesiNPUTmice2014-07-101-6/+6
* | | | added group add buttoniNPUTmice2014-07-102-16/+21
* | | | added action bar menu to start conversationiNPUTmice2014-07-102-0/+29
* | | | changed support lib to v13. added tabs and fragments to start conversation ac...iNPUTmice2014-07-102-1/+10
* | | | moved hint box to the bottomiNPUTmice2014-07-102-50/+63
* | | | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-091-5/+11
|\ \ \ \
| * \ \ \ Merge pull request #245 from beriain/developmentDaniel Gultsch2014-07-081-5/+11
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Update strings.xmlAitor Beriain2014-07-071-5/+11
* | | | | unified warnings/error msgsiNPUTmice2014-07-099-124/+33
|/ / / /