NodeBB v0.3.0 Released
-
-
I just updated it for you, its indentation by four spaces
test
-
@psychobunny Thank you!
-
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: package.json
# both modified: src/upgrade.jsThese are the problems. Those files need conflicts resolved. Why was
upgrade.js
even changed? -
@julian I dont know how to check that?
-
I would just
rm package.json rm src/upgrade.js git pull ./nodebb upgrade
(you could make a backup of those two files first, but I'm assuming you modified them by accident)
-
I get this:
module.js:340
throw err;
^
Error: Cannot find module './package.json'
at Function.Module._resolveFilename (module.js:338:15)
at Function.Module._load (module.js:280:25)
at Module.require (module.js:364:17)
at require (module.js:380:17)
at /home/capitansupositorio/mynodebb/app.js:31:9
at Object.<anonymous> (/home/capitansupositorio/mynodebb/app.js:187:2)
at Module._compile (module.js:456:26)
at Object.Module._extensions..js (module.js:474:10)
at Module.load (module.js:356:32)
at Function.Module._load (module.js:312:12)#NodeBB Dependencies up-to-date!
-
@julian Now its working, thanks you are awsome! ... the responsive not work on android with theme levander.
-
@Pablo-Macaluso Whats not working with that theme e.g. whats it look like
-
-
I update it, and installed some plugins and i get error 502 again -.-
-
@julian said:
I update it, and installed some plugins and i get error 502 again -.-
@Pablo-Macaluso What is the error when you start NodeBB with
./nodebb dev
?info: [plugins] Loaded plugin: nodebb-plugin-42
info: [plugins] Sorting hooks to fire in priority sequence
info: [plugins] Plugins OK
info: [nodebb-plugin-42] initializing
info: NodeBB Ready/home/capitansupositorio/mynodebb/node_modules/nodebb-plugin-42/library.js:76
Plugin.config = utils.merge({}, pluginData.defaults, config);
^
TypeError: Object #<Object> has no method 'merge'
at /home/capitansupositorio/mynodebb/node_modules/nodebb-plugin-42/library.js:76:28
at /home/capitansupositorio/mynodebb/node_modules/nodebb-plugin-42/node_modules/fs-extra/node_modules/jsonfile/lib/jsonfile.js:18:5
at fs.js:266:14
at /usr/lib/nodejs/graceful-fs.js:94:5
at Object.oncomplete (fs.js:107:15) -
@julian said:
Well, that's weird. You're on
master
branch, right?git status
to find out.If not:
git checkout master && ./nodebb upgrade
# On branch master # Your branch is behind 'origin/master' by 92 commits, and can be fast-forwarded. # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # NodeBB/ # gippy/