Commit Graph

143 Commits (96b9d416983d4ac50963ae708c055c2d905107b7)

Author SHA1 Message Date
psychobunny 96b9d41698 removed return to home link from topic, realized that breadcrumbs are right on top
psychobunny 2dccfb96e7 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/posts.js
	src/topics.js
psychobunny ae2be687b8 small refactor plus breadcrumbs for all ur pages
Julian Lam ae43a299df hiding edit and delete buttons from indiv. posts if thread is locked
Julian Lam d35bffa830 removing topic from listing if deleted, and adding lock icon if thread is locked
Julian Lam 2ce70dbb93 restricting upvoting if a thread is locked
Julian Lam 43a76f9c9c fixing socket returns to emit to everybody in the room (on thread locking/deletion)
Julian Lam 7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
Baris Usakli 9ad1b572aa what i have
Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
Julian Lam 250c70bdfc topic locking and deletion
Baris Usakli 85acabf1f6 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny ace64cec7b Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 31542cd9be finished recent, popular and active posts shells, just need to update api methods
Baris Usakli 4ffbf88274 fixed header to link to new users page
Baris Usakli ec104b05d4 added links to user profiles from posts and the breadcrumbs
psychobunny 1df9de049b forgot templates config
psychobunny c80d178a57 duhsign for category home page
Julian Lam b2c6d4f7c7 interim commit to thread options
Julian Lam d7c5a3c150 merging from stash
psychobunny 97c1819dc4 forgot to commit category files
psychobunny fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
Baris Soner Usakli e57ae200e4 account page border
Julian Lam 35770edcae added thread tools dropdown
Julian Lam f0f1ed7ed8 added lock icon to locked button in threads
Julian Lam b6f3211ce7 if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
Baris Soner Usakli 91c2271ffd account page
Baris Soner Usakli 48d5100dfe some profile changes, added post count to users and account and some css to account
psychobunny ecf3ffa170 fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language
psychobunny 1009726b51 almost done X users browsing this thread feature. there is one bug where anonymous users do not get disconnected from the room, so I'll have to figure that out later
Baris Soner Usakli c906b7419a added reputation to /account
Baris Soner Usakli fee76db8dc more fixes
Baris Soner Usakli 8a0266562c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli 08f7b64ccf hash changes to user data
psychobunny 26c22b0559 bugfixes + starting active users in thread feature
psychobunny 3947b6b6fd modified ajaxify slightly to make transitions between pages a bit more fluid (although first load doesn't look that awesome); fixed up rooms - resolved DRY failure and properly leave rooms
psychobunny 8133ac53de small change to ajaxify to ignore href='#', added some design to future features, up for grabs if anybody wants to do them
psychobunny b47f292eaa Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 496ed20615 fixed annoying footer being hidden then reshown on first load
Julian Lam 1fc6e0db2c added email verification on registration
added email header and footer
Baris Soner Usakli 73e958e627 added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name
psychobunny 93c5931bb0 fixed listener memleak causing new posts to appear duplicated
psychobunny dd4758725e fixed bug where events weren't being attached to new posts being parsed in
psychobunny f0bb70fa3a adjusting rep of a user now affects all instances of that user on the page
psychobunny 35f2ac7bf7 small style changes in header, added edit and delete button for moderators/own posts, hide moderator tools for all users except those that qualify
psychobunny 4807002447 fix for responsive avatar, fix for submit/discard buttons taking you away from the thread
Julian Lam c5cf128629 Merge branch 'master' of github.com:psychobunny/node-forum
psychobunny ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
Julian Lam 0dbc1ba692 restricted the user.get socket listener to only react once
psychobunny b7782dbf7f clean up