aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* added join conference dialogiNPUTmice2014-07-113-2/+54
* 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-116-639/+8
* changed 'show time threshold' to 6hiNPUTmice2014-07-111-1/+1
* fixed #255 and made some other improvements to the subscription mgmtiNPUTmice2014-07-114-41/+49
* Merge pull request #262 from kruks23/developmentDaniel Gultsch2014-07-111-1/+1
|\
| * Show time in messages previous dayskruks232014-07-101-2/+2
| * Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-107-18/+393
| |\
| * \ Merge branch 'development' of https://github.com/siacs/Conversations into dev...kruks232014-07-093-32/+26
| |\ \
| * | | Show time in messages previous dayskruks232014-07-081-1/+1
* | | | dirty push / delete flags are not set/reset correctlyiNPUTmice2014-07-101-4/+2
* | | | fixed #38iNPUTmice2014-07-106-7/+126
| |_|/ |/| |
* | | added create contact dialogiNPUTmice2014-07-101-1/+64
* | | added contextual menu for contactsiNPUTmice2014-07-104-15/+69
* | | small changesiNPUTmice2014-07-101-19/+1
* | | made searchview text color whiteiNPUTmice2014-07-101-0/+4
* | | filter contacts and starting confercenesiNPUTmice2014-07-104-24/+179
* | | added group add buttoniNPUTmice2014-07-101-4/+9
* | | added action bar menu to start conversationiNPUTmice2014-07-101-0/+21
* | | changed support lib to v13. added tabs and fragments to start conversation ac...iNPUTmice2014-07-102-1/+81
* | | inital activityiNPUTmice2014-07-101-0/+11
| |/ |/|
* | unified warnings/error msgsiNPUTmice2014-07-093-32/+26
|/
* contact tiles follow material colors as welliNPUTmice2014-07-082-6/+13
* made account jid lowercaseiNPUTmice2014-07-041-1/+2
* made contact jids lower caseiNPUTmice2014-07-042-2/+4
* added timeout to jingle socketiNPUTmice2014-07-032-3/+16
* more xmlpullparser fixesiNPUTmice2014-07-031-0/+2
* Merge branch 'development'iNPUTmice2014-07-032-2/+6
|\
| * fixed array out of bounds in isMuciNPUTmice2014-07-031-2/+5
| * enabled anti alising for tilesiNPUTmice2014-07-021-0/+1
* | allow state loss on fragment changeiNPUTmice2014-07-011-1/+1
* | fixed npe on rare occasion of show element in presence being nulliNPUTmice2014-07-011-1/+1
|/
* fixed #216iNPUTmice2014-07-011-3/+7
* fixed image sharing with contacts that have multiple presencesiNPUTmice2014-07-011-16/+25
* removed old notification iconiNPUTmice2014-06-301-1/+1
* fixed rare npe in verify otr fingerprint dialogiNPUTmice2014-06-301-4/+6
* possible fix for #232iNPUTmice2014-06-301-6/+35
* couple of modifications for disco discoveryiNPUTmice2014-06-301-3/+12
* fixed #235iNPUTmice2014-06-302-129/+164
* fixed #228iNPUTmice2014-06-302-1/+12
* added error message for #240iNPUTmice2014-06-301-3/+19
* more error handling for jingle connectionsiNPUTmice2014-06-299-57/+89
* raised ping time outiNPUTmice2014-06-271-3/+3
* faulty otr messages now generate an erroriNPUTmice2014-06-263-5/+25
* fixed rare bug with attach image menuiNPUTmice2014-06-261-0/+6
* moved some try catchs aroundiNPUTmice2014-06-251-5/+5
* more npe fixesiNPUTmice2014-06-252-3/+8
* fixed two rare npeiNPUTmice2014-06-252-44/+49