1433 Commits (65b49d5de874d035024a383ed2584bbcfd0dc836)

Author SHA1 Message Date
psychobunny a68ba044c3 fixed missing topic_name and viewcount when reverse infinite scrolling 11 years ago
psychobunny 857df86726 fixed pagination, and loading of template blocks on cold load (temp solution) 11 years ago
psychobunny 875c8ed66c console.log 11 years ago
psychobunny 62afe65ccf bugfix + deprecated templates.getTemplateNameFromUrl 11 years ago
psychobunny 712c382a28 optimizing ajaxify (still needs work though) 11 years ago
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
11 years ago
barisusakli 73c89010cb closes #1182 11 years ago
barisusakli 57f9f8bc57 closes #1176 11 years ago
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
11 years ago
barisusakli 6496b91c29 closes #1180 11 years ago
Julian Lam 6fb393de78 fixing #1177 11 years ago
Julian Lam 5a8a3627d2 bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER 11 years ago
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
11 years ago
Baris Soner Usakli 30130b2d62 set back to false when loading indicator fades out 11 years ago
Baris Soner Usakli 6a824a2e10 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 11 years ago
Baris Soner Usakli 7dfdab0a2d search page change 11 years ago
psychobunny 7183fda2eb console.log 11 years ago
psychobunny bcd8137d0e console.log 11 years ago
psychobunny 55a7838725 temporary templateMapping fix for admin side; will come back to this after merging this branch 11 years ago
Julian Lam 1f23642ab4 Merge branch 'master' of github.com:designcreateplay/NodeBB 11 years ago
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) 11 years ago
Baris Soner Usakli 7135e9424c closes #1167 11 years ago
Baris Soner Usakli 3fe9bdc24c removed the postbar selector from activeusers 11 years ago
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
11 years ago
MrWaffle 33a5a2177e Send the callback to the retry 11 years ago
psychobunny 3614211f0e Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	public/templates/accountposts.tpl
	public/templates/header.tpl
11 years ago
psychobunny 552eb78db8 template compiling init; changing themes now finally works on this branch 11 years ago
psychobunny 88e5ddac76 deprecating hook events on body 11 years ago
psychobunny c67182204f clean-up + bugfixes 11 years ago
psychobunny 444956d517 deprecated loadTemplates client-side as well 11 years ago
psychobunny 68d526b762 deprecated templates.ready, templates.init, templates.loadServer; start webserver immediately without having to wait for templates.js 11 years ago
psychobunny f73fd1eeae removed an unused hack in utils.js 11 years ago
Baris Soner Usakli 76d8d09f9b closes #1141 11 years ago
Baris Soner Usakli d100a41ce7 fixes topic follow 11 years ago
psychobunny 6e8c618fb1 prevent translator crash if data is undefined; linted/cleanup 11 years ago
psychobunny cd336006fc optimized cold loading 11 years ago
Baris Soner Usakli 8c11299197 template language fix 11 years ago
psychobunny 10f4fa004e Merge remote-tracking branch 'origin/master' into webserver.js-refactor 11 years ago
psychobunny 48df0cf889 Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
	src/routes/admin.js
11 years ago
medwards20x6 76b53478ce Don't fire click when closing an alert 11 years ago
Baris Soner Usakli dbb814fe4e category permission page fixes 11 years ago
Baris Soner Usakli be70b3de57 closes #1090 11 years ago
Baris Soner Usakli 529cd60dd2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 11 years ago
Baris Soner Usakli 70299ea5c2 better search result page 11 years ago
psychobunny c26af77a24 fixing cold load of admin/index 11 years ago
Julian Lam 64ee792013 fixed #1154 11 years ago
Julian Lam 5a8fa9b1f7 fixed regression in groups management modal 11 years ago
psychobunny 5b25e21606 console.log 11 years ago
psychobunny d20501b29d meta.js merge conflict 11 years ago
psychobunny c44934cc0d all JS files properly required on cold load 11 years ago