Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | show full time stamp in connection established field | iNPUTmice | 2014-11-16 | 1 | -1/+1 |
| | |||||
* | made scan and show qr code more accessible in VerifyOtrActivity | iNPUTmice | 2014-11-16 | 2 | -53/+107 |
| | |||||
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 5 | -21/+51 |
| | | | | shareable uri where ever possible | ||||
* | Remove extra status wrapper method | Sam Whited | 2014-11-15 | 1 | -2/+1 |
| | |||||
* | Add incompatible server status | Sam Whited | 2014-11-15 | 1 | -65/+13 |
| | |||||
* | Add security error status | Sam Whited | 2014-11-15 | 1 | -0/+4 |
| | |||||
* | Make account status an enum | Sam Whited | 2014-11-15 | 8 | -27/+27 |
| | |||||
* | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 4 | -82/+223 |
|\ | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| * | handled more error cases | iNPUTmice | 2014-11-15 | 2 | -5/+29 |
| | | |||||
| * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 3 | -3/+18 |
| | | |||||
| * | made file transfers cancelable | iNPUTmice | 2014-11-15 | 1 | -1/+16 |
| | | |||||
| * | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-15 | 1 | -3/+21 |
| | | |||||
| * | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 2 | -45/+40 |
| | | |||||
| * | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-15 | 1 | -2/+7 |
| | | |||||
| * | copy non local files to private storage first | iNPUTmice | 2014-11-15 | 1 | -4/+19 |
| | | |||||
| * | bug fixes and various improvements for file transfer | iNPUTmice | 2014-11-15 | 1 | -4/+9 |
| | | |||||
| * | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 2 | -47/+96 |
| | | |||||
* | | Merge branch 'feature/foreground_service' into development | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| * | | turn on foreground service in expert settings | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
| |/ | |||||
* | | check if account is online before doing smp | iNPUTmice | 2014-11-12 | 1 | -11/+24 |
| | | |||||
* | | Merge branch 'feature/otr_verification' of ↵ | iNPUTmice | 2014-11-11 | 1 | -1/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | ||||
| * | | small bug fix | iNPUTmice | 2014-11-10 | 1 | -8/+3 |
| | | | |||||
| * | | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-10 | 2 | -113/+140 |
| | | | |||||
| * | | initial smp support | iNPUTmice | 2014-11-10 | 3 | -9/+273 |
| | | | |||||
* | | | use auto register for verify otr listeners | iNPUTmice | 2014-11-11 | 1 | -9/+0 |
| | | | |||||
* | | | small bug fix | iNPUTmice | 2014-11-11 | 1 | -8/+3 |
| | | | |||||
* | | | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-11 | 2 | -113/+140 |
| | | | |||||
* | | | initial smp support | iNPUTmice | 2014-11-11 | 3 | -9/+273 |
| |/ |/| | |||||
* | | auto register/unregister listeners | iNPUTmice | 2014-11-11 | 7 | -345/+289 |
| | | |||||
* | | temporarliy got rid of some insane work arounds in favor of some maybe less ↵ | iNPUTmice | 2014-11-11 | 2 | -6/+9 |
|/ | | | | insane work arounds | ||||
* | more refactoring for presence selection. removed getTo, getFrom and getJid ↵ | iNPUTmice | 2014-11-10 | 2 | -15/+22 |
| | | | | from Element | ||||
* | use isBareJid instead of getResourcePart().isEmpty() | iNPUTmice | 2014-11-09 | 2 | -2/+2 |
| | |||||
* | fixed muc sender history for some cases (where the previous nick was a valid ↵ | iNPUTmice | 2014-11-09 | 2 | -8/+17 |
| | | | | jid) | ||||
* | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 11 | -16/+16 |
| | | | | Remove `Account.getFullJid()' | ||||
* | refactored code to always contain full jid for counterpart | iNPUTmice | 2014-11-09 | 3 | -35/+34 |
| | |||||
* | Fix contact highlighting in MUC | Sam Whited | 2014-11-09 | 1 | -2/+2 |
| | |||||
* | Fix crash on account creation | Sam Whited | 2014-11-09 | 1 | -13/+2 |
| | |||||
* | Create avatar's for JID's w/o localparts | Sam Whited | 2014-11-09 | 1 | -19/+1 |
| | |||||
* | Fix bug introduced by rebase | Sam Whited | 2014-11-09 | 1 | -5/+4 |
| | |||||
* | Fix letter avatar selection in MUC | Sam Whited | 2014-11-09 | 1 | -13/+1 |
| | |||||
* | More formatting fixes in MUC | Sam Whited | 2014-11-09 | 1 | -1/+5 |
| | |||||
* | Format contact names in MUC properly | Sam Whited | 2014-11-09 | 2 | -24/+27 |
| | |||||
* | It builds again! | Sam Whited | 2014-11-09 | 1 | -2/+4 |
| | |||||
* | Update more files to use JID objects | Sam Whited | 2014-11-09 | 9 | -32/+77 |
| | |||||
* | Update another chunk of stuff to use JID objects | Sam Whited | 2014-11-09 | 6 | -74/+96 |
| | |||||
* | update conversation fragment on every backend connect | iNPUTmice | 2014-11-08 | 1 | -2/+3 |
| | |||||
* | Merge pull request #549 from emdete/p2 | Daniel Gultsch | 2014-11-08 | 1 | -3/+7 |
|\ | | | | | adjust api level wrapping | ||||
| * | adjust api level wrapping | M. Dietrich | 2014-11-04 | 1 | -3/+7 |
| | | |||||
* | | bug fixes for the previous ui refactoring | iNPUTmice | 2014-11-07 | 3 | -27/+20 |
| | | |||||
* | | UI code refactoring | iNPUTmice | 2014-11-07 | 3 | -253/+172 |
| | |