Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 1 | -6/+0 |
| | | | | allowMessageCorrection to preferences | ||||
* | Merge tag '1.9.4' into trz/merge_1.9.4 | lookshe | 2016-02-16 | 1 | -14/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml | ||||
| * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 1 | -15/+4 |
| | | | | | | | | Only has status for now, but doing it so I can add disco to it | ||||
* | | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵ | steckbrief | 2016-02-13 | 1 | -5/+0 |
|/ | | | | generator classes. | ||||
* | Sign empty status | fiaxh | 2015-11-09 | 1 | -1/+0 |
| | |||||
* | introduced expert options to set status to away and xa if screen is off or ↵ | Daniel Gultsch | 2015-10-08 | 1 | -1/+16 |
| | | | | if phone is silenced | ||||
* | Fix typos in URL to the project | Alexander Groshev | 2015-05-03 | 1 | -2/+2 |
| | |||||
* | don't resume old session when changing resource | iNPUTmice | 2015-04-09 | 1 | -0/+7 |
| | |||||
* | adapt caps on whether or not message confirmation is on | iNPUTmice | 2015-01-26 | 1 | -1/+1 |
| | |||||
* | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 1 | -2/+2 |
| | | | | Remove `Account.getFullJid()' | ||||
* | Move a chunk of classes over to using JID objects | Sam Whited | 2014-11-09 | 1 | -3/+3 |
| | |||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+57 |