mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

resolve merge conflict

Browse source
This commit is contained in:
John McLear 2014-12-29 01:54:44 +01:00
commit c4959b089f
18 changed files with 1 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/hooks/express/adminplugins.js
View file

@ -1,10 +1,8 @@
var path = require('path');
var eejs = require('ep_etherpad-lite/node/eejs');
var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
var _ = require('underscore');
var semver = require('semver');
var async = require('async');
exports.expressCreateServer = function (hook_name, args, cb) {
args.app.get('/admin/plugins', function(req, res) {

2
src/node/hooks/express/adminsettings.js
View file

@ -1,7 +1,5 @@
var path = require('path');
var eejs = require('ep_etherpad-lite/node/eejs');
var settings = require('ep_etherpad-lite/node/utils/Settings');
var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks");
var fs = require('fs');

1
src/node/hooks/express/padreadonly.js
View file

@ -10,7 +10,6 @@ exports.expressCreateServer = function (hook_name, args, cb) {
{
var html;
var padId;
var pad;
async.series([
//translate the read only pad to a padId

1
src/node/hooks/express/socketio.js
View file

@ -1,4 +1,3 @@
var log4js = require('log4js');
var settings = require('../../utils/Settings');
var socketio = require('socket.io');
var socketIORouter = require("../../handler/SocketIORouter");

3
src/node/hooks/express/static.js
View file

@ -1,11 +1,8 @@
var path = require('path');
var minify = require('../../utils/Minify');
var plugins = require("ep_etherpad-lite/static/js/pluginfw/plugins");
var CachingMiddleware = require('../../utils/caching_middleware');
var settings = require("../../utils/Settings");
var Yajsml = require('yajsml');
var fs = require("fs");
var ERR = require("async-stacktrace");
var _ = require("underscore");
exports.expressCreateServer = function (hook_name, args, cb) {

1
src/node/hooks/express/swagger.js
View file

@ -1,4 +1,3 @@
var log4js = require('log4js');
var express = require('express');
var apiHandler = require('../../handler/APIHandler');
var apiCaller = require('./apicalls').apiCaller;

1
src/node/hooks/express/webaccess.js
View file

@ -2,7 +2,6 @@ var express = require('express');
var log4js = require('log4js');
var httpLogger = log4js.getLogger("http");
var settings = require('../../utils/Settings');
var randomString = require('ep_etherpad-lite/static/js/pad_utils').randomString;
var hooks = require('ep_etherpad-lite/static/js/pluginfw/hooks');
var ueberStore = require('../../db/SessionStore');
var stats = require('ep_etherpad-lite/node/stats')

1
src/node/hooks/i18n.js
View file

@ -1,7 +1,6 @@
var languages = require('languages4translatewiki')
, fs = require('fs')
, path = require('path')
, express = require('express')
, _ = require('underscore')
, npm = require('npm')
, plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins.js').plugins