aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* deleted invalid gcm stringsDaniel Gultsch2016-02-141-5/+0
* optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-143-29/+63
* send push enable to server. simplified loggingDaniel Gultsch2016-02-134-3/+57
* fixed compile bug in free versionDaniel Gultsch2016-02-135-9/+15
* removed gcm plugin from gradle. fixes #1693Daniel Gultsch2016-02-121-4/+2
* push gcm token on bind instead of every connectDaniel Gultsch2016-02-121-5/+3
* add play services to travis configDaniel Gultsch2016-02-121-0/+4
* client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-1213-37/+267
* pulled translations from transifexDaniel Gultsch2016-02-115-16/+768
* version bump to 1.9.4 + changelog1.9.4Daniel Gultsch2016-02-112-2/+6
* catch all axolotl parse exception at once. fixes #1692Daniel Gultsch2016-02-111-5/+4
* send muc messages after joinDaniel Gultsch2016-02-101-1/+2
* allow user to set MAM preferencesDaniel Gultsch2016-02-095-16/+119
* prepend instead off append mam messages to conversations when going in reverseDaniel Gultsch2016-02-042-2/+13
* fixed performance regression in on scroll listenerDaniel Gultsch2016-02-042-3/+8
* prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-049-17/+92
* add more fault tolerant checks for messages left on serverDaniel Gultsch2016-02-043-7/+21
* removed unecessary logging when muc tiles updateDaniel Gultsch2016-02-041-1/+0
* use TLSv1.2 as SSL context on supported plattformsDaniel Gultsch2016-02-033-2/+14
* cache server capsDaniel Gultsch2016-02-033-3/+36
* count all messages in a queryDaniel Gultsch2016-02-032-8/+3
* Revert "get rid of broken totalMessageCount for mam queries"Daniel Gultsch2016-02-032-4/+16
* refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-036-43/+116
* Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-0211-152/+467
|\
| * Do disco for caps hashes we have never seenStephen Paul Weber2016-01-241-2/+23
| * Fetch cached caps result on new presenceStephen Paul Weber2016-01-242-3/+14
| * Use a Presence class for presence informationStephen Paul Weber2016-01-248-102/+121
| * Persisitence and loading for ServiceDiscoveryResultStephen Paul Weber2016-01-232-11/+98
| * Implement toJSON on ServiceDiscoveryResultStephen Paul Weber2016-01-231-0/+34
| * Generate capHash from any discovery resultStephen Paul Weber2016-01-231-4/+80
| * Factor out a representation of XEP-0030 resultsStephen Paul Weber2016-01-232-47/+114
* | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
* | get rid of broken totalMessageCount for mam queriesDaniel Gultsch2016-02-022-16/+4
* | re-read common name from certificates on startupDaniel Gultsch2016-02-022-2/+32
* | avoid npe when accessing the pgp connection serviceDaniel Gultsch2016-02-021-1/+1
* | catch a few NPE when parsing invalid pep nodesDaniel Gultsch2016-02-021-3/+3
* | version bump to 1.9.31.9.3Daniel Gultsch2016-02-012-2/+8
* | respect autojoin setting on newly created bookmarks as wellDaniel Gultsch2016-02-011-1/+1
* | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-015-5/+20
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-02-011-1/+1
|\ \
| * | Update README.mdDaniel Gultsch2016-01-311-1/+1
* | | made create context menu call in StartConversationsActivity more failsafeDaniel Gultsch2016-02-011-1/+1
* | | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-014-86/+70
* | | fixed false set of subject in conference with empty body tagDaniel Gultsch2016-01-311-1/+1
* | | prefer dns servers from networsk with the default routeDaniel Gultsch2016-01-291-2/+17
|/ /
* | be more careful with resetting the stream idDaniel Gultsch2016-01-291-2/+1
* | try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
* | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-266-7/+58
* | hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
* | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-255-11/+48