You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
.gitignore	added gitignore to public/templates dir	11 years ago
account.tpl	post summary change	11 years ago
accountedit.tpl	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
accountposts.tpl	post summary change	11 years ago
favourites.tpl	post summary change	11 years ago
header.tpl	Merge remote-tracking branch 'origin/master' into webserver.js-refactor	11 years ago
search.tpl	search page change	11 years ago