aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | theming for tabs in start conversationiNPUTmice2014-07-1026-12/+34
* | | filter contacts and starting confercenesiNPUTmice2014-07-105-30/+185
* | | added group add buttoniNPUTmice2014-07-103-20/+30
* | | added action bar menu to start conversationiNPUTmice2014-07-103-0/+50
* | | changed support lib to v13. added tabs and fragments to start conversation ac...iNPUTmice2014-07-107-2/+97
* | | inital activityiNPUTmice2014-07-101-0/+11
* | | 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-0912-156/+59
|/ /
* | contact tiles follow material colors as welliNPUTmice2014-07-082-6/+13
* | uniformed colors. made colors a little materialiNPUTmice2014-07-0823-108/+107
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-07-072-29/+120
|\|
| * Merge pull request #256 from kruks23/developmentDaniel Gultsch2014-07-071-0/+2
| |\
| | * Update Spanish Translationskruks232014-07-071-0/+2
| * | Merge pull request #257 from BenoitBouvarel/developmentDaniel Gultsch2014-07-071-29/+118
| |\ \ | | |/ | |/|
| | * Update strings.xmlBenoit Bouvarel2014-07-071-31/+25
| | * French translation updatedBenoit Bouvarel2014-07-071-3/+98
* | | changed icons to lightiNPUTmice2014-07-0759-6/+4
|/ /
* / styled action bar greeniNPUTmice2014-07-072-24/+46
|/
* made account jid lowercaseiNPUTmice2014-07-041-1/+2
* made contact jids lower caseiNPUTmice2014-07-042-2/+4
* small ui overhauls. unified text sizes. made text a bit smaller. moved messag...iNPUTmice2014-07-0412-33/+48