aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-201-1/+1
|\
| * resetting fetch status error when mutual subscription is reestablishedDaniel Gultsch2016-05-191-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-151-0/+1
|\|
| * log incoming iq requestsDaniel Gultsch2016-05-151-0/+1
| * show only username when registering account with magic createDaniel Gultsch2016-05-021-1/+1
* | add share locationChristian S2016-05-051-1/+2
* | changed avatar format to JPEG and increased size to 720 pxChristian S2016-04-301-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-7/+0
|\|
| * don't request disco from selfDaniel Gultsch2016-04-281-2/+0
| * removed unused config variablesDaniel Gultsch2016-04-271-6/+0
* | changlog for upcoming versionChristian S2016-04-231-1/+1
* | increased disco timeoutChristian S2016-04-231-1/+1
* | added multiple ports to connect to...Christian S2016-04-221-1/+1
* | use IP/port to connect to serverChristian S2016-04-211-0/+3
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-0/+1
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-151-2/+0
|\|
| * always notify by default in conferencesDaniel Gultsch2016-04-141-2/+0
* | make foreground service always enabledChristian S2016-04-151-1/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-141-0/+1
|\|
| * create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-131-0/+1
* | Revert "chnaged avatar format to match XEP"Christian S2016-04-111-1/+1
* | chnaged avatar format to match XEPChristian S2016-04-091-1/+1
* | add option to only allow one account and set it to trueChristian S2016-04-041-2/+1
* | only resend files smaller than 1 MiB automaticallyChristian S2016-03-051-1/+3
* | allow users to edit settings and accountsChristian S2016-03-041-2/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-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
* | Merge branch 'siacs/master' into developmentChristian S2016-02-271-5/+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 branch 'siacs/master' into developmentChristian S2016-02-141-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 remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-0/+2
|\|
| * refactored disco cache. avoid making duplicate call. check hashDaniel Gultsch2016-02-031-0/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-1/+3
|\|
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-01-101-0/+3
|\|
| * 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
* | copy commitsChristian S2015-12-161-1/+6
|\|
| * 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