Reverting changes for core files

Этот коммит содержится в:
Asaad Mahmood
2016-03-14 22:37:42 +05:00
родитель e214aae719
Коммит 595ca0efca
2 изменённых файлов: 5 добавлений и 30 удалений

Просмотреть файл

@@ -11,7 +11,7 @@
"EnableOnlyAdminIntegrations": true, "EnableOnlyAdminIntegrations": true,
"EnablePostUsernameOverride": false, "EnablePostUsernameOverride": false,
"EnablePostIconOverride": false, "EnablePostIconOverride": false,
"EnableTesting": true, "EnableTesting": false,
"EnableDeveloper": false, "EnableDeveloper": false,
"EnableSecurityFixAlert": true, "EnableSecurityFixAlert": true,
"EnableInsecureOutgoingConnections": false, "EnableInsecureOutgoingConnections": false,
@@ -19,9 +19,7 @@
"SessionLengthWebInDays": 30, "SessionLengthWebInDays": 30,
"SessionLengthMobileInDays": 30, "SessionLengthMobileInDays": 30,
"SessionLengthSSOInDays": 30, "SessionLengthSSOInDays": 30,
"SessionCacheInMinutes": 10, "SessionCacheInMinutes": 10
"WebsocketSecurePort": 443,
"WebsocketPort": 80
}, },
"TeamSettings": { "TeamSettings": {
"SiteName": "Mattermost", "SiteName": "Mattermost",
@@ -74,7 +72,7 @@
"EnableSignUpWithEmail": true, "EnableSignUpWithEmail": true,
"EnableSignInWithEmail": true, "EnableSignInWithEmail": true,
"EnableSignInWithUsername": false, "EnableSignInWithUsername": false,
"SendEmailNotifications": true, "SendEmailNotifications": false,
"RequireEmailVerification": false, "RequireEmailVerification": false,
"FeedbackName": "", "FeedbackName": "",
"FeedbackEmail": "", "FeedbackEmail": "",
@@ -115,28 +113,5 @@
"AuthEndpoint": "", "AuthEndpoint": "",
"TokenEndpoint": "", "TokenEndpoint": "",
"UserApiEndpoint": "" "UserApiEndpoint": ""
},
"GoogleSettings": {
"Enable": false,
"Secret": "",
"Id": "",
"Scope": "",
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
},
"LdapSettings": {
"Enable": false,
"LdapServer": null,
"LdapPort": 389,
"BaseDN": null,
"BindUsername": null,
"BindPassword": null,
"FirstNameAttribute": null,
"LastNameAttribute": null,
"EmailAttribute": null,
"UsernameAttribute": null,
"IdAttribute": null,
"QueryTimeout": 60
} }
} }

Просмотреть файл

@@ -31,7 +31,7 @@ var CurrentVersion string = versions[0]
var BuildNumber = "_BUILD_NUMBER_" var BuildNumber = "_BUILD_NUMBER_"
var BuildDate = "_BUILD_DATE_" var BuildDate = "_BUILD_DATE_"
var BuildHash = "_BUILD_HASH_" var BuildHash = "_BUILD_HASH_"
var BuildEnterpriseReady = "false" var BuildEnterpriseReady = "_BUILD_ENTERPRISE_READY_"
var versionsWithoutHotFixes []string var versionsWithoutHotFixes []string
func init() { func init() {