liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: file resolvers + pull changes from master

Browse Source
This commit is contained in:
NGPixel
2017-09-04 13:03:15 -04:00
parent 574e4b97f4
commit 35cb56c694
10 changed files with 459 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/git.js
View File

@@ -53,10 +53,9 @@ module.exports = {
self.onReady = (wiki.IS_MASTER) ? self._initRepo() : Promise.resolve()
// Define signature
if (wiki.config.git) {
self._signature.email = wiki.config.git.serverEmail || 'wiki@example.com'
self._repo.branch = appconfig.git.branch || 'master'
self._signature.email = appconfig.git.serverEmail || 'wiki@example.com'
}
return self

2
server/modules/graphql.js
View File

@@ -12,6 +12,7 @@ const typeDefs = fs.readFileSync(path.join(wiki.SERVERPATH, 'schemas/types.graph
const DateScalar = require('../schemas/scalar-date')
const CommentResolvers = require('../schemas/resolvers-comment')
const DocumentResolvers = require('../schemas/resolvers-document')
const FileResolvers = require('../schemas/resolvers-file')
const FolderResolvers = require('../schemas/resolvers-folder')
const GroupResolvers = require('../schemas/resolvers-group')
const SettingResolvers = require('../schemas/resolvers-setting')
@@ -21,6 +22,7 @@ const UserResolvers = require('../schemas/resolvers-user')
const resolvers = _.merge(
CommentResolvers,
DocumentResolvers,
FileResolvers,
FolderResolvers,
GroupResolvers,
SettingResolvers,