Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | try to automatically rejoin muc after beeing kicked | Christian S | 2016-02-14 | 1 | -1/+2 |
| | |||||
* | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 20 | -94/+521 |
|\ | |||||
| * | deleted invalid gcm strings | Daniel Gultsch | 2016-02-14 | 1 | -5/+0 |
| | | |||||
| * | optional mode to close tcp connection when going into background | Daniel Gultsch | 2016-02-14 | 3 | -29/+63 |
| | | | | | | | | acts only when push is available. disable all non-push accounts to test properly | ||||
| * | send push enable to server. simplified logging | Daniel Gultsch | 2016-02-13 | 4 | -3/+57 |
| | | |||||
| * | fixed compile bug in free version | Daniel Gultsch | 2016-02-13 | 5 | -9/+15 |
| | | |||||
| * | removed gcm plugin from gradle. fixes #1693 | Daniel Gultsch | 2016-02-12 | 1 | -4/+2 |
| | | |||||
| * | push gcm token on bind instead of every connect | Daniel Gultsch | 2016-02-12 | 1 | -5/+3 |
| | | |||||
| * | add play services to travis config | Daniel Gultsch | 2016-02-12 | 1 | -0/+4 |
| | | |||||
| * | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 13 | -37/+267 |
| | | |||||
| * | pulled translations from transifex | Daniel Gultsch | 2016-02-11 | 5 | -16/+768 |
| | | |||||
| * | version bump to 1.9.4 + changelog | 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 |
| | | |||||
* | | Update CHANGELOG.md | Christian S | 2016-02-06 | 1 | -1/+1 |
| | | |||||
* | | added missing strings/translations | Christian S | 2016-02-06 | 2 | -1/+10 |
| | | |||||
* | | optimized subtitle in MUCs | Christian S | 2016-02-06 | 2 | -22/+19 |
| | | |||||
* | | match new presence modifications | Christian S | 2016-02-04 | 2 | -9/+2 |
| | | |||||
* | | Add device name to client info | Artem Shipovskiy | 2016-02-04 | 3 | -0/+15 |
| | | |||||
* | | removed duplicate string | Christian S | 2016-02-04 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 32 | -328/+900 |
|\| | |||||
| * | 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 |
| | | | |||||
| * | | version bump to 1.9.3 | Daniel Gultsch | 2016-02-01 | 2 | -2/+8 |
| | | | |||||
| * | | respect autojoin setting on newly created bookmarks as well | Daniel Gultsch | 2016-02-01 | 1 | -1/+1 |
| | | | |||||
| * | | opt out handling of the autojoin flag. fixes #1666 | Daniel Gultsch | 2016-02-01 | 5 | -5/+20 |
| | | | |||||
| * | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-02-01 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | made create context menu call in StartConversationsActivity more failsafe | Daniel Gultsch | 2016-02-01 | 1 | -1/+1 |
| | | | |