| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | clear encrypted messages on reinit | iNPUTmice | 2014-12-01 | 1 | -2/+13 | |
| | | ||||||
| * | don't request fragment before updating | iNPUTmice | 2014-11-30 | 1 | -6/+2 | |
| | | ||||||
| * | Misc. "fixes" to correct warnings. | Sam Whited | 2014-11-29 | 1 | -3/+6 | |
| | | ||||||
| * | fixed npe. fixed #717 | iNPUTmice | 2014-11-27 | 1 | -5/+6 | |
| | | ||||||
| * | create conversation with bare jid | iNPUTmice | 2014-11-27 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #713 from betheg/muc | Daniel Gultsch | 2014-11-24 | 2 | -1/+19 | |
| |\ | | | | | MUC: do not add yourself to the muc user list. | |||||
| | * | add an listener for the muc roster update. | Michael | 2014-11-23 | 2 | -1/+19 | |
| | | | | | | | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately. | |||||
| * | | MUC: option to set/delete bookmark in conference details. | Michael | 2014-11-23 | 1 | -0/+39 | |
| |/ | ||||||
| * | Merge pull request #706 from betheg/unused_imports | Daniel Gultsch | 2014-11-21 | 6 | -11/+0 | |
| |\ | | | | | remove unused imports. | |||||
| | * | remove unused imports. | Michael | 2014-11-21 | 6 | -11/+0 | |
| | | | ||||||
| * | | update action bar with conversations updates as well | iNPUTmice | 2014-11-21 | 1 | -27/+35 | |
| | | | ||||||
| * | | move task to back and not finish when hitting back button | iNPUTmice | 2014-11-21 | 1 | -7/+5 | |
| |/ | ||||||
| * | verify contacts key only on initiating side of smp | iNPUTmice | 2014-11-21 | 1 | -3/+10 | |
| | | ||||||
| * | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 4 | -37/+87 | |
| | | ||||||
| * | some saftey checks before registering listeners in XmppActivity | iNPUTmice | 2014-11-19 | 1 | -1/+12 | |
| | | ||||||
| * | synchronized message list in conversation fragment | iNPUTmice | 2014-11-18 | 1 | -113/+118 | |
| | | ||||||
| * | show dynamic tags in contacts activity as well | iNPUTmice | 2014-11-18 | 1 | -33/+26 | |
| | | ||||||
| * | properly remove conversations context menu | iNPUTmice | 2014-11-18 | 2 | -41/+20 | |
| | | ||||||
| * | disabled broken conversations context menu | iNPUTmice | 2014-11-18 | 1 | -3/+3 | |
| | | ||||||
| * | better usage of synchronized in some places | iNPUTmice | 2014-11-18 | 1 | -1/+1 | |
| | | ||||||
| * | context menu for conversations. fixed #630 | iNPUTmice | 2014-11-18 | 1 | -9/+45 | |
| | | ||||||
| * | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 3 | -24/+74 | |
| | | ||||||
| * | Fix linter suppression | Sam Whited | 2014-11-17 | 1 | -2/+3 | |
| | | ||||||
| * | highlight muc members by touching their name in muc details. fixed #503 | iNPUTmice | 2014-11-17 | 3 | -72/+105 | |
| | | ||||||
| * | fixed regression of xmpp uris not working | iNPUTmice | 2014-11-16 | 1 | -11/+8 | |
| | | ||||||
| * | happy hanukkah | iNPUTmice | 2014-11-16 | 1 | -0/+21 | |
| | | ||||||
| * | 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 | |
| | | | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |