aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove extra status wrapper methodSam Whited2014-11-151-2/+1
* Add incompatible server statusSam Whited2014-11-151-65/+13
* Add security error statusSam Whited2014-11-151-0/+4
* Make account status an enumSam Whited2014-11-158-27/+27
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-154-82/+223
|\
| * handled more error casesiNPUTmice2014-11-152-5/+29
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-153-3/+18
| * made file transfers cancelableiNPUTmice2014-11-151-1/+16
| * adepted conversationadapter to deal with filesiNPUTmice2014-11-151-3/+21
| * some mime and pgp fixes for file transferiNPUTmice2014-11-152-45/+40
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-2/+7
| * copy non local files to private storage firstiNPUTmice2014-11-151-4/+19
| * bug fixes and various improvements for file transferiNPUTmice2014-11-151-4/+9
| * basic arbitrary file transferiNPUTmice2014-11-152-47/+96
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-151-0/+2
|\ \
| * | turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+2
| |/
* | check if account is online before doing smpiNPUTmice2014-11-121-11/+24
* | Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversat...iNPUTmice2014-11-111-1/+0
|\ \
| * | small bug fixiNPUTmice2014-11-101-8/+3
| * | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-102-113/+140
| * | initial smp supportiNPUTmice2014-11-103-9/+273
* | | use auto register for verify otr listenersiNPUTmice2014-11-111-9/+0
* | | small bug fixiNPUTmice2014-11-111-8/+3
* | | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-112-113/+140
* | | initial smp supportiNPUTmice2014-11-113-9/+273
| |/ |/|
* | auto register/unregister listenersiNPUTmice2014-11-117-345/+289
* | temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-112-6/+9
|/
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-102-15/+22
* use isBareJid instead of getResourcePart().isEmpty()iNPUTmice2014-11-092-2/+2
* fixed muc sender history for some cases (where the previous nick was a valid ...iNPUTmice2014-11-092-8/+17
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-0911-16/+16
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-093-35/+34
* Fix contact highlighting in MUCSam Whited2014-11-091-2/+2
* Fix crash on account creationSam Whited2014-11-091-13/+2
* Create avatar's for JID's w/o localpartsSam Whited2014-11-091-19/+1
* Fix bug introduced by rebaseSam Whited2014-11-091-5/+4
* Fix letter avatar selection in MUCSam Whited2014-11-091-13/+1
* More formatting fixes in MUCSam Whited2014-11-091-1/+5
* Format contact names in MUC properlySam Whited2014-11-092-24/+27
* It builds again!Sam Whited2014-11-091-2/+4
* Update more files to use JID objectsSam Whited2014-11-099-32/+77
* Update another chunk of stuff to use JID objectsSam Whited2014-11-096-74/+96
* update conversation fragment on every backend connectiNPUTmice2014-11-081-2/+3
* Merge pull request #549 from emdete/p2Daniel Gultsch2014-11-081-3/+7
|\
| * adjust api level wrappingM. Dietrich2014-11-041-3/+7
* | bug fixes for the previous ui refactoringiNPUTmice2014-11-073-27/+20
* | UI code refactoringiNPUTmice2014-11-073-253/+172
* | fixed #633iNPUTmice2014-11-061-24/+26
* | don't show avatar on initial account creationiNPUTmice2014-11-061-2/+4
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-042-0/+56
|\ \