Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-25 08:09:43 +02:00
Code Releases Activity

Merge branch 'master' into trello-improvements

Browse source
This commit is contained in:
Elliott Stoneham 2016-09-08 06:36:53 +01:00
commit 86de669fed
9 changed files with 1294 additions and 1155 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/api/endpoint/server.go
View file

@ -28,10 +28,10 @@ import (
)
var port, certFile, keyFile, forcePort2SSL string
var product core.ProdInfo
var Product core.ProdInfo
func init() {
product = core.Product()
Product = core.Product()
environment.GetString(&certFile, "cert", false, "the cert.pem file used for https", nil)
environment.GetString(&keyFile, "key", false, "the key.pem file used for https", nil)
environment.GetString(&port, "port", false, "http/https port number", nil)
@ -49,7 +49,7 @@ func Serve(ready chan struct{}) {
os.Exit(1)
}
log.Info(fmt.Sprintf("Starting %s version %s", product.Title, product.Version))
log.Info(fmt.Sprintf("Starting %s version %s", Product.Title, Product.Version))
switch web.SiteMode {
case web.SiteModeOffline:
@ -146,7 +146,7 @@ func cors(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
func metrics(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
w.Header().Add("X-Documize-Version", product.Version)
w.Header().Add("X-Documize-Version", Product.Version)
w.Header().Add("Cache-Control", "no-cache")
// Prevent page from being displayed in an iframe
@ -161,7 +161,7 @@ func metrics(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
}
func version(w http.ResponseWriter, r *http.Request) {
if _, err := w.Write([]byte(product.Version)); err != nil {
if _, err := w.Write([]byte(Product.Version)); err != nil {
log.Error("versionHandler", err)
}
}

2
core/database/scripts/autobuild/db_00001.sql
View file

@ -1,4 +1,4 @@
/* enterprise edition */
DROP TABLE IF EXISTS `share`;
CREATE TABLE IF NOT EXISTS `share` (

15
core/database/scripts/autobuild/db_00002.sql Normal file
View file

@ -0,0 +1,15 @@
/* enterprise edition */
DROP TABLE IF EXISTS `feedback`;
CREATE TABLE IF NOT EXISTS `feedback` (
`id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
`refid` CHAR(16) NOT NULL COLLATE utf8_bin,
`orgid` CHAR(16) NOT NULL COLLATE utf8_bin,
`documentid` CHAR(16) NOT NULL COLLATE utf8_bin,
`userid` CHAR(16) DEFAULT '' COLLATE utf8_bin,
`email` NVARCHAR(250) NOT NULL DEFAULT '',
`feedback` LONGTEXT,
`created` TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT pk_id PRIMARY KEY (id))
DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
ENGINE = InnoDB;