aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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-156-12/+87
* | use proper picture on bookmarked conferences when joined. use bookmark title ...iNPUTmice2014-07-147-23/+59
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-141-1/+5
|\ \
| * \ Merge pull request #273 from kruks23/developmentDaniel Gultsch2014-07-131-1/+5
| |\ \
| | * | Update Spanish Translationskruks232014-07-131-1/+5
| |/ /
* | | fetch bookmarks from serveriNPUTmice2014-07-148-17/+254
* | | fixed spelling in README and added mission statement to docsiNPUTmice2014-07-142-1/+26
|/ /
* | more faqiNPUTmice2014-07-121-0/+17
* | spelling in readmeiNPUTmice2014-07-121-2/+2
* | added two more qna to the faqiNPUTmice2014-07-121-0/+24
* | added statement about status and priority to faqiNPUTmice2014-07-121-6/+23
* | fixed #268iNPUTmice2014-07-121-0/+0
* | refactored ui listeners a little bitiNPUTmice2014-07-129-294/+398
* | made conversation list thread safeiNPUTmice2014-07-124-8/+15
* | moved iq parser to seperate class as welliNPUTmice2014-07-123-97/+108
* | cleanup for presence parseriNPUTmice2014-07-123-19/+11
* | moved most of the message/presence generation into seperate classesiNPUTmice2014-07-129-135/+150
* | made message parser and presence parser implement interface On*PacketReceivediNPUTmice2014-07-123-151/+147
* | switch SearchView with custom action viewiNPUTmice2014-07-115-94/+149
* | added join conference dialogiNPUTmice2014-07-117-7/+110
* | improved iterating over hashmapiNPUTmice2014-07-112-12/+5
* | fishing invites and delivery reports out of carbon copied messagesiNPUTmice2014-07-111-6/+10
* | made jingle connection array thread safeiNPUTmice2014-07-112-5/+4
* | cleanup. removed old contacts activity. WARNING: this will temporarly disable...iNPUTmice2014-07-1110-752/+21
* | changed 'show time threshold' to 6hiNPUTmice2014-07-111-1/+1
* | fixed #255 and made some other improvements to the subscription mgmtiNPUTmice2014-07-115-53/+49
* | Merge pull request #262 from kruks23/developmentDaniel Gultsch2014-07-112-4/+17
|\ \
| * | Update Spanish Translationskruks232014-07-101-3/+16
| * | Show time in messages previous dayskruks232014-07-101-2/+2
| * | Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-1043-83/+600
| |\ \
| * \ \ Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-0912-156/+59
| |\ \ \
| * | | | Show time in messages previous dayskruks232014-07-081-1/+1
* | | | | dirty push / delete flags are not set/reset correctlyiNPUTmice2014-07-101-4/+2
* | | | | added bitcoin addressiNPUTmice2014-07-101-3/+4
* | | | | formating and paypal disclaimeriNPUTmice2014-07-101-0/+6
* | | | | add donate buttoniNPUTmice2014-07-101-2/+4
* | | | | fixed #38iNPUTmice2014-07-108-13/+130
| |_|/ / |/| | |
* | | | added create contact dialogiNPUTmice2014-07-103-4/+106
* | | | added contextual menu for contactsiNPUTmice2014-07-106-15/+85
* | | | small changesiNPUTmice2014-07-103-28/+13
* | | | made searchview text color whiteiNPUTmice2014-07-101-0/+4