aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-6/+8
|\
| * disable stanza loggingDaniel Gultsch2016-05-211-1/+1
| * resetting fetch status error when mutual subscription is reestablishedshow_members_in_conferenceDaniel Gultsch2016-05-191-1/+1
| * log incoming iq requestsDaniel Gultsch2016-05-151-0/+1
| * show only username when registering account with magic createDaniel Gultsch2016-05-021-1/+1
| * don't request disco from selfDaniel Gultsch2016-04-281-2/+0
| * removed unused config variablesDaniel Gultsch2016-04-271-6/+0
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-50/+36
|\ \
* \ \ Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-2/+1
|\ \ \ | | |/ | |/|
| * | always notify by default in conferencesDaniel Gultsch2016-04-141-2/+0
| * | create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-131-0/+1
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-5/+1
|\| |
| * | removed unused config variableDaniel Gultsch2016-03-011-4/+0
| * | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+1
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+2
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-1/+0
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-2/+37
|\| |
| * | hide add account icons when single_account is set to trueDaniel Gultsch2016-02-241-1/+2
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+4
| * | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-241-2/+32
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+2
|\| |
| * | optional mode to close tcp connection when going into backgroundDaniel Gultsch2016-02-141-0/+2
| * | client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-1/+0
* | | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+2
|\| |
| * | refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-031-0/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-4/+33
|\| |
| * | added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+2
| * | automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-091-0/+1
| * | added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-081-0/+2
| * | timeout service discovery after 20sDaniel Gultsch2015-12-151-0/+1
| * | default force encryption to falseDaniel Gultsch2015-12-141-1/+1
| * | splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+3
| * | disable sm loggingDaniel Gultsch2015-12-101-5/+1
| * | enabled previously disabled http uploadDaniel Gultsch2015-12-031-1/+1
| * | introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-1/+1
| * | introduce config.java variable to optionally show number of connected account...Daniel Gultsch2015-12-011-0/+2
| * | refactored socks5 connection code. make jingle transport use that new codeDaniel Gultsch2015-12-011-1/+1
| * | initial tor supportDaniel Gultsch2015-12-011-0/+4
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-1/+2
| * | work with muc services that change the message idDaniel Gultsch2015-10-141-0/+2
| * | add config variable to enable x509 verificationDaniel Gultsch2015-10-121-0/+2
| * | introduced Config variable to use legacy namespace for http uploadDaniel Gultsch2015-09-171-0/+2
| * | increased dns timeoutDaniel Gultsch2015-09-101-1/+1
| * | increased carbon grace period to 90sDaniel Gultsch2015-08-241-1/+1
| * | report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-101-0/+2
| * | added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-051-0/+1
| * | added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-0/+4
| * | lets try jpeg for a whileDaniel Gultsch2015-08-011-1/+1
| * | Hide regenerate keys buttonAndreas Straub2015-07-221-0/+2