Commit Graph

2463 Commits (2cde4508b00e1e36aadf388d58b6c7c106785d0c)

Author SHA1 Message Date
psychobunny a68ba044c3 fixed missing topic_name and viewcount when reverse infinite scrolling
psychobunny 857df86726 fixed pagination, and loading of template blocks on cold load (temp solution)
psychobunny 875c8ed66c console.log
psychobunny 62afe65ccf bugfix + deprecated templates.getTemplateNameFromUrl
psychobunny 712c382a28 optimizing ajaxify (still needs work though)
psychobunny 464c2f42c3 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js
psychobunny 68b41083ad removing re-added templates from core
barisusakli 73c89010cb closes
barisusakli 57f9f8bc57 closes
psychobunny 1ef95bd09e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	app.js
	public/templates/category.tpl
	public/templates/popular.tpl
	public/templates/recent.tpl
	public/templates/unread.tpl
	src/routes/plugins.js
	src/webserver.js
barisusakli 6496b91c29 closes
barisusakli b4b9ed1841 optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
Julian Lam 6fb393de78 fixing
Julian Lam 5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
psychobunny e84dd4fd94 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountedit.tpl
	public/templates/header.tpl
	src/routes/meta.js
	src/webserver.js
Baris Soner Usakli 30130b2d62 set back to false when loading indicator fades out
Baris Soner Usakli 6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7dfdab0a2d search page change
Julian Lam 5880590425 removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes 
psychobunny 7183fda2eb console.log
psychobunny bcd8137d0e console.log
psychobunny 55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch
Julian Lam 1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam e9e53ad95e added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
Baris Soner Usakli 7135e9424c closes
Baris Soner Usakli 3fe9bdc24c removed the postbar selector from activeusers
psychobunny 542f937589 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/api.js
Baris Soner Usakli c028761857 new route to get recent posts
psychobunny 73d637096c Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/account.tpl
	public/templates/accountposts.tpl
	public/templates/favourites.tpl
	public/templates/search.tpl
Julian Lam 6192af18ab Merge pull request from BitBangersCode/settings-callback
Send the callback to the retry
MrWaffle 33a5a2177e Send the callback to the retry
Baris Soner Usakli 976744480f post summary change
psychobunny 3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
psychobunny 552eb78db8 template compiling init; changing themes now finally works on this branch
psychobunny 88e5ddac76 deprecating hook events on body
psychobunny c67182204f clean-up + bugfixes
psychobunny 444956d517 deprecated loadTemplates client-side as well
psychobunny 68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js
psychobunny f73fd1eeae removed an unused hack in utils.js
Baris Soner Usakli 76d8d09f9b closes
psychobunny d4f453cde3 added gitignore to public/templates dir
psychobunny 66ef8c8284 removed vanilla templates from core into nodebb-theme-vanilla :shipit:
Baris Soner Usakli d100a41ce7 fixes topic follow
psychobunny 6e8c618fb1 prevent translator crash if data is undefined; linted/cleanup
psychobunny cd336006fc optimized cold loading
Baris Soner Usakli 8c11299197 template language fix
psychobunny 10f4fa004e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
psychobunny 48df0cf889 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/admin.js
Barış Soner Uşaklı 81378e071b Merge pull request from MakerStudios/alertclose_nofire_click
Don't fire click when closing an alert
Julian Lam 9b53dd1014 english fallback for 'reset_password' translations