aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* MUC: set from when join muc.Michael2014-11-211-0/+1
* import fixesiNPUTmice2014-11-201-0/+2
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-201-3/+0
|\
| * Remove broken / unused importsSam Whited2014-11-191-3/+0
* | brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-202-33/+140
|/
* sent read marker to full jidiNPUTmice2014-11-191-7/+8
* put error notification into notification serviceiNPUTmice2014-11-182-4/+42
* better usage of synchronized in some placesiNPUTmice2014-11-181-76/+78
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-171-1/+1
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-9/+15
* Merge pull request #673 from SamWhited/developmentDaniel Gultsch2014-11-161-1/+1
|\
| * Fix fetching accounts by JIDsSam Whited2014-11-161-1/+1
* | happy hanukkahiNPUTmice2014-11-161-10/+4
|/
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-161-8/+7
* Make account status an enumSam Whited2014-11-152-98/+98
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-152-37/+74
|\
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-152-44/+24
| * fixed resending for files as welliNPUTmice2014-11-151-3/+3
| * made file transfers cancelableiNPUTmice2014-11-151-0/+5
| * support for pgp filesiNPUTmice2014-11-151-3/+11
| * copy non local files to private storage firstiNPUTmice2014-11-151-17/+28
| * bug fixes and various improvements for file transferiNPUTmice2014-11-151-1/+1
| * basic arbitrary file transferiNPUTmice2014-11-151-3/+36
* | added low priority and removed date in foreground noticficationiNPUTmice2014-11-151-0/+2
* | turn on foreground service in expert settingsiNPUTmice2014-11-152-9/+37
|/
* temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-111-8/+8
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-208/+231
* migrated some otr stuff to new jid classesiNPUTmice2014-11-091-7/+9
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-092-19/+19
|\
| * Rework `Account.getJid()' to return full JIDsSam Whited2014-11-092-19/+19
* | Merge branch 'master' into developmentiNPUTmice2014-11-091-14/+22
|\ \ | |/ |/|
| * make avatar service not break on empty namesiNPUTmice2014-11-091-14/+22
* | refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-25/+41
* | Create avatar's for JID's w/o localpartsSam Whited2014-11-091-3/+3
* | Fields that we sync on should be finalSam Whited2014-11-091-1/+1
* | It builds again!Sam Whited2014-11-091-5/+2
* | Update more files to use JID objectsSam Whited2014-11-092-7/+7
* | Move a chunk of classes over to using JID objectsSam Whited2014-11-091-84/+89
|/
* fixed notifications for imagesiNPUTmice2014-11-051-13/+34
* fixed #617iNPUTmice2014-11-051-26/+22
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-011-1/+1
* Merge branch 'gradle' into developmentSam Whited2014-10-303-80/+192
* Make conversations the root projectSam Whited2014-10-225-0/+2509