NodeBB v0.3.0 Released
-
Thats what says <git status>
capitansupositorio@foro:~/mynodebb$ git status # On branch v0.2.x # Changes to be committed: # # modified: .gitignore # new file: .tx/config # modified: app.js # modified: nodebb # new file: public/language/ar/category.json # new file: public/language/ar/footer.json # new file: public/language/ar/global.json # new file: public/language/ar/language.json # new file: public/language/ar/login.json # new file: public/language/ar/modules.json # new file: public/language/ar/notifications.json # new file: public/language/ar/pages.json # new file: public/language/ar/recent.json # new file: public/language/ar/register.json # new file: public/language/ar/reset_password.json # new file: public/language/ar/topic.json # new file: public/language/ar/unread.json # new file: public/language/ar/user.json # new file: public/language/ar/users.json # new file: public/language/cs/category.json # new file: public/language/cs/footer.json # new file: public/language/cs/global.json # new file: public/language/cs/language.json # new file: public/language/cs/login.json # new file: public/language/cs/modules.json # new file: public/language/cs/notifications.json # new file: public/language/cs/pages.json # new file: public/language/cs/recent.json # new file: public/language/cs/register.json # new file: public/language/cs/reset_password.json # new file: public/language/cs/topic.json # new file: public/language/cs/unread.json # new file: public/language/cs/user.json # new file: public/language/cs/users.json # modified: public/language/de/category.json # modified: public/language/de/footer.json # modified: public/language/de/global.json # new file: public/language/de/language.json # modified: public/language/de/login.json # new file: public/language/de/modules.json # modified: public/language/de/notifications.json # new file: public/language/de/pages.json # modified: public/language/de/recent.json # modified: public/language/de/register.json # modified: public/language/de/reset_password.json # modified: public/language/de/topic.json # modified: public/language/de/unread.json # modified: public/language/de/user.json # modified: public/language/de/users.json # renamed: public/language/en/category.json -> public/language/en_GB/category.json # new file: public/language/en_GB/footer.json # renamed: public/language/en/global.json -> public/language/en_GB/global.json # new file: public/language/en_GB/language.json # renamed: public/language/en/login.json -> public/language/en_GB/login.json # renamed: public/language/en/footer.json -> public/language/en_GB/modules.json # renamed: public/language/en/notifications.json -> public/language/en_GB/notifications.json # new file: public/language/en_GB/pages.json # renamed: public/language/en/recent.json -> public/language/en_GB/recent.json # renamed: public/language/en/register.json -> public/language/en_GB/register.json # renamed: public/language/en/reset_password.json -> public/language/en_GB/reset_password.json # renamed: public/language/en/topic.json -> public/language/en_GB/topic.json # renamed: public/language/en/unread.json -> public/language/en_GB/unread.json # renamed: public/language/en/user.json -> public/language/en_GB/user.json # renamed: public/language/en/users.json -> public/language/en_GB/users.json # modified: public/language/es/category.json # modified: public/language/es/footer.json # modified: public/language/es/global.json # new file: public/language/es/language.json # modified: public/language/es/login.json # new file: public/language/es/modules.json # modified: public/language/es/notifications.json # new file: public/language/es/pages.json # modified: public/language/es/recent.json # modified: public/language/es/register.json # modified: public/language/es/reset_password.json # modified: public/language/es/topic.json # modified: public/language/es/unread.json # modified: public/language/es/user.json # modified: public/language/es/users.json # new file: public/language/fi/category.json # new file: public/language/fi/footer.json # new file: public/language/fi/global.json # new file: public/language/fi/language.json # new file: public/language/fi/login.json # new file: public/language/fi/modules.json # new file: public/language/fi/notifications.json # new file: public/language/fi/pages.json # new file: public/language/fi/recent.json # new file: public/language/fi/register.json # new file: public/language/fi/reset_password.json # new file: public/language/fi/topic.json # new file: public/language/fi/unread.json # new file: public/language/fi/user.json # new file: public/language/fi/users.json # modified: public/language/fr/category.json # modified: public/language/fr/footer.json # modified: public/language/fr/global.json # new file: public/language/fr/language.json # modified: public/language/fr/login.json # new file: public/language/fr/modules.json # modified: public/language/fr/notifications.json # new file: public/language/fr/pages.json # modified: public/language/fr/recent.json # modified: public/language/fr/register.json # modified: public/language/fr/reset_password.json # modified: public/language/fr/topic.json # modified: public/language/fr/unread.json # modified: public/language/fr/user.json # modified: public/language/fr/users.json # new file: public/language/it/category.json # new file: public/language/it/footer.json # new file: public/language/it/global.json # new file: public/language/it/language.json # new file: public/language/it/login.json # new file: public/language/it/modules.json # new file: public/language/it/notifications.json # new file: public/language/it/pages.json # new file: public/language/it/recent.json # new file: public/language/it/register.json # new file: public/language/it/reset_password.json # new file: public/language/it/topic.json # new file: public/language/it/unread.json # new file: public/language/it/user.json # new file: public/language/it/users.json # new file: public/language/pt_BR/category.json # new file: public/language/pt_BR/footer.json # new file: public/language/pt_BR/global.json # new file: public/language/pt_BR/language.json # new file: public/language/pt_BR/login.json # new file: public/language/pt_BR/modules.json # new file: public/language/pt_BR/notifications.json # new file: public/language/pt_BR/pages.json # new file: public/language/pt_BR/recent.json # new file: public/language/pt_BR/register.json # new file: public/language/pt_BR/reset_password.json # new file: public/language/pt_BR/topic.json # new file: public/language/pt_BR/unread.json # new file: public/language/pt_BR/user.json # new file: public/language/pt_BR/users.json # new file: public/language/sk/category.json # new file: public/language/sk/footer.json # new file: public/language/sk/global.json # new file: public/language/sk/language.json # new file: public/language/sk/login.json # new file: public/language/sk/modules.json # new file: public/language/sk/notifications.json # new file: public/language/sk/pages.json # new file: public/language/sk/recent.json # new file: public/language/sk/register.json # new file: public/language/sk/reset_password.json # new file: public/language/sk/topic.json # new file: public/language/sk/unread.json # new file: public/language/sk/user.json # new file: public/language/sk/users.json # new file: public/language/sv/category.json # new file: public/language/sv/footer.json # new file: public/language/sv/global.json # new file: public/language/sv/language.json # new file: public/language/sv/login.json # new file: public/language/sv/modules.json # new file: public/language/sv/notifications.json # new file: public/language/sv/pages.json # new file: public/language/sv/recent.json # new file: public/language/sv/register.json # new file: public/language/sv/reset_password.json # new file: public/language/sv/topic.json # new file: public/language/sv/unread.json # new file: public/language/sv/user.json # new file: public/language/sv/users.json # new file: public/language/zh_CN/category.json # new file: public/language/zh_CN/footer.json # new file: public/language/zh_CN/global.json # new file: public/language/zh_CN/language.json # new file: public/language/zh_CN/login.json # new file: public/language/zh_CN/modules.json # new file: public/language/zh_CN/notifications.json # new file: public/language/zh_CN/pages.json # new file: public/language/zh_CN/recent.json # new file: public/language/zh_CN/register.json # new file: public/language/zh_CN/reset_password.json # new file: public/language/zh_CN/topic.json # new file: public/language/zh_CN/unread.json # new file: public/language/zh_CN/user.json # new file: public/language/zh_CN/users.json # new file: public/language/zh_TW/category.json # new file: public/language/zh_TW/footer.json # new file: public/language/zh_TW/global.json # new file: public/language/zh_TW/language.json # new file: public/language/zh_TW/login.json # new file: public/language/zh_TW/modules.json # new file: public/language/zh_TW/notifications.json # new file: public/language/zh_TW/pages.json # new file: public/language/zh_TW/recent.json # new file: public/language/zh_TW/register.json # new file: public/language/zh_TW/reset_password.json # new file: public/language/zh_TW/topic.json # new file: public/language/zh_TW/unread.json # new file: public/language/zh_TW/user.json # new file: public/language/zh_TW/users.json # modified: public/src/ajaxify.js # modified: public/src/app.js # modified: public/src/forum/account.js # modified: public/src/forum/accountedit.js # modified: public/src/forum/accountheader.js # modified: public/src/forum/accountsettings.js # modified: public/src/forum/admin/categories.js # modified: public/src/forum/admin/footer.js # modified: public/src/forum/admin/groups.js # modified: public/src/forum/admin/index.js # new file: public/src/forum/admin/languages.js # modified: public/src/forum/admin/plugins.js # modified: public/src/forum/admin/settings.js # modified: public/src/forum/admin/themes.js # modified: public/src/forum/admin/topics.js # modified: public/src/forum/admin/users.js # modified: public/src/forum/category.js # modified: public/src/forum/footer.js # modified: public/src/forum/home.js # modified: public/src/forum/login.js # modified: public/src/forum/notifications.js # new file: public/src/forum/pagination.js # new file: public/src/forum/popular.js # modified: public/src/forum/recent.js # modified: public/src/forum/register.js # modified: public/src/forum/reset.js # modified: public/src/forum/reset_code.js # modified: public/src/forum/search.js # modified: public/src/forum/topic.js # modified: public/src/forum/unread.js # modified: public/src/forum/users.js # modified: public/src/modules/chat.js # modified: public/src/modules/composer.js # new file: public/src/modules/notifications.js # modified: public/src/templates.js # modified: public/src/translator.js # modified: public/src/utils.js # modified: public/templates/account.tpl # modified: public/templates/accountedit.tpl # modified: public/templates/accountsettings.tpl # modified: public/templates/admin/categories.tpl # modified: public/templates/admin/database.tpl # modified: public/templates/admin/events.tpl # deleted: public/templates/admin/facebook.tpl # deleted: public/templates/admin/gplus.tpl # modified: public/templates/admin/groups.tpl # modified: public/templates/admin/header.tpl # new file: public/templates/admin/languages.tpl # modified: public/templates/admin/logger.tpl # modified: public/templates/admin/motd.tpl # modified: public/templates/admin/plugins.tpl # modified: public/templates/admin/settings.tpl # deleted: public/templates/admin/testing/categories.tpl # modified: public/templates/admin/themes.tpl # modified: public/templates/admin/topics.tpl # deleted: public/templates/admin/twitter.tpl # modified: public/templates/admin/users.tpl # modified: public/templates/category.tpl # new file: public/templates/chat.tpl # modified: public/templates/composer.tpl # modified: public/templates/config.json # modified: public/templates/confirm.tpl # deleted: public/templates/emails/email_confirm.tpl # deleted: public/templates/emails/email_confirm_plaintext.tpl # deleted: public/templates/emails/footer.tpl # deleted: public/templates/emails/header.tpl # modified: public/templates/emails/reset.tpl # modified: public/templates/emails/reset_plaintext.tpl # new file: public/templates/emails/welcome.tpl # new file: public/templates/emails/welcome_plaintext.tpl # modified: public/templates/favourites.tpl # modified: public/templates/followers.tpl # modified: public/templates/following.tpl # modified: public/templates/footer.tpl # modified: public/templates/header.tpl # modified: public/templates/home.tpl # deleted: public/templates/install/basic.tpl # deleted: public/templates/install/footer.tpl # deleted: public/templates/install/header.tpl # deleted: public/templates/install/mail.tpl # deleted: public/templates/install/privileges.tpl # deleted: public/templates/install/redis.tpl # deleted: public/templates/install/social.tpl # modified: public/templates/login.tpl # modified: public/templates/logout.tpl # modified: public/templates/noscript/category.tpl # modified: public/templates/notifications.tpl # modified: public/templates/outgoing.tpl # new file: public/templates/popular.tpl # modified: public/templates/recent.tpl # new file: public/templates/recentreplies.tpl # modified: public/templates/register.tpl # modified: public/templates/reset.tpl # modified: public/templates/reset_code.tpl # modified: public/templates/search.tpl # modified: public/templates/topic.tpl # modified: public/templates/unread.tpl # modified: public/templates/users.tpl # deleted: public/vendor/bootstrap/css/bootstrap-theme.css # deleted: public/vendor/bootstrap/css/bootstrap-theme.min.css # deleted: public/vendor/bootstrap/css/bootstrap.css # deleted: public/vendor/bootstrap/css/bootstrap.min.css # deleted: public/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js # new file: public/vendor/jquery/js/jquery-ui-1.10.4.custom.js # renamed: public/vendor/jquery/js/jquery.timeago.js -> public/vendor/jquery/timeago/jquery.timeago.js # new file: public/vendor/jquery/timeago/locales/README.md # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ar.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.bg.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.bs.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ca.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.cy.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.cz.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.da.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.de.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.el.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.en-short.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.en.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.es.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.et.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.fa.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.fi.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.fr-short.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.fr.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.gl.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.he.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.hr.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.hu.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.hy.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.id.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.is.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.it.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ja.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.jv.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ko.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.lt.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.mk.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.nl.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.no.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.pl.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.pt-br.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.pt.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ro.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.rs.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.ru.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.sk.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.sl.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.sv.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.th.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.tr.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.uk.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.uz.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.vi.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.zh-CN.js # new file: public/vendor/jquery/timeago/locales/jquery.timeago.zh-TW.js # modified: src/admin/user.js # modified: src/categories.js # modified: src/categoryTools.js # modified: src/database/mongo.js # modified: src/database/redis.js # new file: src/emailer.js # modified: src/events.js # modified: src/favourites.js # modified: src/feed.js # modified: src/groups.js # modified: src/install.js # new file: src/languages.js # deleted: src/login.js # modified: src/messaging.js # modified: src/meta.js # modified: src/notifications.js # modified: src/plugins.js # modified: src/postTools.js # modified: src/posts.js # modified: src/routes/admin.js # modified: src/routes/api.js # modified: src/routes/authentication.js # modified: src/routes/debug.js # modified: src/routes/plugins.js # modified: src/routes/user.js # modified: src/sitemap.js # new file: src/socket.io/admin.js # new file: src/socket.io/categories.js # new file: src/socket.io/index.js # new file: src/socket.io/meta.js # new file: src/socket.io/modules.js # new file: src/socket.io/notifications.js # new file: src/socket.io/posts.js # new file: src/socket.io/tools.js # new file: src/socket.io/topics.js # new file: src/socket.io/user.js # modified: src/threadTools.js # modified: src/topics.js # modified: src/user.js # modified: src/webserver.js # deleted: src/websockets.js # modified: tests/categories.js # modified: tests/database.js # modified: tests/user.js # # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: package.json # both modified: src/upgrade.js # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # NodeBB/ -
@Pablo-Macaluso Biiiig text. Might wanna make it smaller
-
-
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.jseven 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)
Copyright © 2024 NodeBB | Contributors