aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* added missing strings/translationsChristian S2016-02-062-1/+10
* optimized subtitle in MUCsChristian S2016-02-062-22/+19
* match new presence modificationsChristian S2016-02-042-9/+2
* Add device name to client infoArtem Shipovskiy2016-02-043-0/+15
* removed duplicate stringChristian S2016-02-041-1/+0
* Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-0430-326/+892
|\
| * 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
| * | 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
| * | 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
* | | Merge branch 'siacs/master'Christian S2016-01-3120-75/+459
|\| |
| * | 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
| * | changed FileBackend API to allow files instead of messages to be copied and r...Daniel Gultsch2016-01-241-33/+34
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-238-4/+160
| |/
| * introduced boolean form field wrapperDaniel Gultsch2016-01-236-14/+76
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| * reset stanza queue when resetting xmppconnectionDaniel Gultsch2016-01-231-0/+1
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-232-1/+15
* | Merge branch 'siacs/master' into developmentChristian S2016-01-2329-147/+353
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-2213-70/+52
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-226-1/+161