aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed npe. fixed #717iNPUTmice2014-11-271-5/+6
* create conversation with bare jidiNPUTmice2014-11-271-1/+1
* Merge pull request #713 from betheg/mucDaniel Gultsch2014-11-242-1/+19
|\
| * add an listener for the muc roster update.Michael2014-11-232-1/+19
* | MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+39
|/
* Merge pull request #706 from betheg/unused_importsDaniel Gultsch2014-11-216-11/+0
|\
| * remove unused imports.Michael2014-11-216-11/+0
* | update action bar with conversations updates as welliNPUTmice2014-11-211-27/+35
* | move task to back and not finish when hitting back buttoniNPUTmice2014-11-211-7/+5
|/
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-3/+10
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-204-37/+87
* some saftey checks before registering listeners in XmppActivityiNPUTmice2014-11-191-1/+12
* synchronized message list in conversation fragmentiNPUTmice2014-11-181-113/+118
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-33/+26
* properly remove conversations context menuiNPUTmice2014-11-182-41/+20
* disabled broken conversations context menuiNPUTmice2014-11-181-3/+3
* better usage of synchronized in some placesiNPUTmice2014-11-181-1/+1
* context menu for conversations. fixed #630iNPUTmice2014-11-181-9/+45
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-173-24/+74
* Fix linter suppressionSam Whited2014-11-171-2/+3
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-173-72/+105
* fixed regression of xmpp uris not workingiNPUTmice2014-11-161-11/+8
* happy hanukkahiNPUTmice2014-11-161-0/+21
* show full time stamp in connection established fieldiNPUTmice2014-11-161-1/+1
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-162-53/+107
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareab...iNPUTmice2014-11-165-21/+51
* 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