Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4 | lookshe | 2016-02-16 | 31 | -245/+925 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | version bump to 1.9.4 + changelog1.9.4 | Daniel Gultsch | 2016-02-11 | 2 | -2/+6 |
| | | |||||
| * | catch all axolotl parse exception at once. fixes #1692 | Daniel Gultsch | 2016-02-11 | 1 | -5/+4 |
| | | |||||
| * | send muc messages after join | Daniel Gultsch | 2016-02-10 | 1 | -1/+2 |
| | | |||||
| * | allow user to set MAM preferences | Daniel Gultsch | 2016-02-09 | 5 | -16/+119 |
| | | |||||
| * | prepend instead off append mam messages to conversations when going in reverse | Daniel Gultsch | 2016-02-04 | 2 | -2/+13 |
| | | |||||
| * | fixed performance regression in on scroll listener | Daniel Gultsch | 2016-02-04 | 2 | -3/+8 |
| | | |||||
| * | prevent previoulsly cleared messages from reloading. fixes #1110 | Daniel Gultsch | 2016-02-04 | 9 | -17/+92 |
| | | |||||
| * | add more fault tolerant checks for messages left on server | Daniel Gultsch | 2016-02-04 | 3 | -7/+21 |
| | | |||||
| * | removed unecessary logging when muc tiles update | Daniel Gultsch | 2016-02-04 | 1 | -1/+0 |
| | | |||||
| * | use TLSv1.2 as SSL context on supported plattforms | Daniel Gultsch | 2016-02-03 | 3 | -2/+14 |
| | | |||||
| * | cache server caps | Daniel Gultsch | 2016-02-03 | 3 | -3/+36 |
| | | |||||
| * | count all messages in a query | Daniel Gultsch | 2016-02-03 | 2 | -8/+3 |
| | | |||||
| * | Revert "get rid of broken totalMessageCount for mam queries" | Daniel Gultsch | 2016-02-03 | 2 | -4/+16 |
| | | | | | | | | This reverts commit 58c6f9bfb283f5c54695b9662b5b4b08e5d4357f. | ||||
| * | refactored disco cache. avoid making duplicate call. check hash | Daniel Gultsch | 2016-02-03 | 6 | -43/+116 |
| | | |||||
| * | Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations ↵ | Daniel Gultsch | 2016-02-02 | 11 | -152/+467 |
| |\ | | | | | | | | | | into singpolyma-disco-caps | ||||
| | * | Do disco for caps hashes we have never seen | Stephen Paul Weber | 2016-01-24 | 1 | -2/+23 |
| | | | | | | | | | | | | Then cache it | ||||
| | * | Fetch cached caps result on new presence | Stephen Paul Weber | 2016-01-24 | 2 | -3/+14 |
| | | | |||||
| | * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 8 | -102/+121 |
| | | | | | | | | | | | | Only has status for now, but doing it so I can add disco to it | ||||
| | * | Persisitence and loading for ServiceDiscoveryResult | Stephen Paul Weber | 2016-01-23 | 2 | -11/+98 |
| | | | |||||
| | * | Implement toJSON on ServiceDiscoveryResult | Stephen Paul Weber | 2016-01-23 | 1 | -0/+34 |
| | | | |||||
| | * | Generate capHash from any discovery result | Stephen Paul Weber | 2016-01-23 | 1 | -4/+80 |
| | | | |||||
| | * | Factor out a representation of XEP-0030 results | Stephen Paul Weber | 2016-01-23 | 2 | -47/+114 |
| | | | | | | | | | | | | And the parser from Element to this representation. | ||||
| * | | fixed 'unencrypted' not showing up for conferences when encryption is forced | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | get rid of broken totalMessageCount for mam queries | Daniel Gultsch | 2016-02-02 | 2 | -16/+4 |
| | | | |||||
| * | | re-read common name from certificates on startup | Daniel Gultsch | 2016-02-02 | 2 | -2/+32 |
| | | | |||||
| * | | avoid npe when accessing the pgp connection service | Daniel Gultsch | 2016-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | catch a few NPE when parsing invalid pep nodes | Daniel Gultsch | 2016-02-02 | 1 | -3/+3 |
| | | | |||||
* | | | Fixes FS#105: XHTML par for images addedtrz/merge_1.9.3 | steckbrief | 2016-02-13 | 1 | -0/+12 |
| | | | |||||
* | | | Fix flagging no more messages on server for conversation | steckbrief | 2016-02-13 | 1 | -16/+18 |
| | | | |||||
* | | | Implements FS#64: Show who wrote last message in conversation overview | steckbrief | 2016-02-13 | 1 | -2/+13 |
| | | | |||||
* | | | Partially implements FS#6: Conference ID changed to ↵ | steckbrief | 2016-02-13 | 1 | -2/+2 |
| | | | | | | | | | | | | c+bugs@conference.thedevstack.de | ||||
* | | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵ | steckbrief | 2016-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | should be shown for a message | ||||
* | | | Unused preference 'picture_compression'. This feature is configured in our ↵ | steckbrief | 2016-02-13 | 20 | -56/+0 |
| | | | | | | | | | | | | variant via 'resize_picture' | ||||
* | | | Fixed overwriting of changes for fixing FS#70. Unused method removed from ↵ | steckbrief | 2016-02-13 | 6 | -79/+5 |
| | | | | | | | | | | | | generator classes. | ||||
* | | | Fixed settings synchronization | steckbrief | 2016-02-12 | 1 | -60/+66 |
| | | | |||||
* | | | Imports organized | steckbrief | 2016-02-12 | 73 | -293/+56 |
| | | | |||||
* | | | Fixed parent activity for logoutput activity | steckbrief | 2016-02-12 | 1 | -3/+3 |
| | | | |||||
* | | | Simplification of DNS requests. | steckbrief | 2016-02-12 | 3 | -254/+130 |
| | | | | | | | | | | | | Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html) | ||||
* | | | green bubbles and setting to choose green or white bubbles removed | steckbrief | 2016-02-12 | 24 | -67/+5 |
| | | | |||||
* | | | Fixed placeholder string for message input box | steckbrief | 2016-02-12 | 2 | -2/+2 |
| | | | |||||
* | | | Fixed layout issue with emojicon tastatur button | steckbrief | 2016-02-12 | 1 | -1/+0 |
| | | | |||||
* | | | Fixed NPE while loading messages via MAM | steckbrief | 2016-02-12 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed runtime errors with axolotl libraries. | steckbrief | 2016-02-12 | 6 | -0/+1 |
| | | | | | | | | | | | | Now the libraries from maven are added. | ||||
* | | | database error while upgrading from db version 14 fixed | steckbrief | 2016-02-12 | 1 | -1/+1 |
| | | | |||||
* | | | axolotl resources changed from maven to jcenter | steckbrief | 2016-02-12 | 5 | -2/+2 |
| | | | |||||
* | | | Compilation errors and merge mixups fixed | steckbrief | 2016-02-11 | 24 | -728/+358 |
| | | | |||||
* | | | Some runtime dependencies added | steckbrief | 2016-02-11 | 3 | -1/+4 |
| | | | |||||
* | | | Fixed XML errors after merge | steckbrief | 2016-02-11 | 6 | -8/+14 |
| | | | |||||
* | | | Fixed third party library references in gradle | steckbrief | 2016-02-11 | 26 | -54/+11 |
| | | |