Commit Graph

46 Commits

Author SHA1 Message Date
psychobunny
2dccfb96e7 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/posts.js
	src/topics.js
2013-05-07 18:29:20 +00:00
psychobunny
ae2be687b8 small refactor plus breadcrumbs for all ur pages 2013-05-07 18:21:00 +00:00
Julian Lam
d35bffa830 removing topic from listing if deleted, and adding lock icon if thread is locked 2013-05-07 13:52:19 -04:00
Julian Lam
a3e816b68e Merge remote-tracking branch 'origin' into thread_options 2013-05-07 13:32:40 -04:00
psychobunny
9e23279459 fixed socket notifications for new posts 2013-05-07 17:27:38 +00:00
Julian Lam
250c70bdfc topic locking and deletion 2013-05-07 12:54:10 -04:00
Julian Lam
d7c5a3c150 merging from stash 2013-05-06 21:15:53 -04:00
psychobunny
fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies 2013-05-06 22:05:42 +00:00
psychobunny
4c524922cc posts.get().unfactored().refactored().commited().pushed(); if (conflicts) throw new Error ('IGNORED'); yep. 2013-05-06 19:46:50 +00:00
Julian Lam
6b9b72a550 restricting post replies if a thread is locked (returns pid of -1 instead) 2013-05-06 15:30:47 -04:00
Julian Lam
922acc0f79 added locked state to Posts.get 2013-05-06 13:48:49 -04:00
Baris Soner Usakli
9a3c907056 set post rep to 0 when created 2013-05-06 13:46:14 -04:00
Baris Soner Usakli
48d5100dfe some profile changes, added post count to users and account and some css to account 2013-05-06 13:25:07 -04:00
Baris Soner Usakli
57354fe582 changed posts.reply to use the getUserFields method and removed the 2 old methods from user.js 2013-05-06 13:01:07 -04:00
Julian Lam
4a1dc28a26 *shenans* refactored Posts.get to use async module instead of callback
pyramid. Call time net decrease = 0, rofl.
2013-05-06 12:04:36 -04:00
Julian Lam
30bf27f1c7 Merge remote-tracking branch 'origin' into posts-refactor 2013-05-06 10:05:10 -04:00
Julian Lam
08c303b3c7 interim commit 2013-05-06 10:05:00 -04:00
psychobunny
8a2c18de5b fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread 2013-05-06 03:41:22 +00:00
Baris Soner Usakli
54b4c55dfc removed the unused login function 2013-05-05 19:13:08 -04:00
Baris Soner Usakli
954392e4c4 fixes to gravatars and get functions in user.js 2013-05-05 18:07:54 -04:00
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 2013-05-04 06:44:00 +00:00
psychobunny
4807002447 fix for responsive avatar, fix for submit/discard buttons taking you away from the thread 2013-05-04 06:11:37 +00:00
Julian Lam
73fc0a3699 customising markdown parser to allow single line breaks 2013-05-04 01:16:45 -04:00
psychobunny
ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why 2013-05-04 04:53:43 +00:00
psychobunny
3e96f64191 streaming posts. also moved topics to be entirely client side parsed. made some changes. added block level caching to templates. added a prepare method to templates 2013-05-03 21:19:28 +00:00
psychobunny
bcb672e1fe socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled 2013-05-03 19:31:21 +00:00
psychobunny
5e48b4cdc5 redis updates for sets: added sadd, srem, and sismember; finished basic favouriting/up/down votes - still need to add socket support in future 2013-05-03 18:54:19 +00:00
Baris Usakli
2a3ef2408f fixed post content 2013-05-03 13:42:59 -04:00
psychobunny
2b50c43a5f Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-03 17:09:46 +00:00
psychobunny
7db1834182 gravatars in posts 2013-05-03 17:09:38 +00:00
Baris Usakli
3c86b43ba3 post count is incrementing when replying 2013-05-03 13:08:16 -04:00
psychobunny
edf58693cc added real username to posts 2013-05-03 16:43:07 +00:00
psychobunny
e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future 2013-05-03 16:22:40 +00:00
Julian Lam
0ae4e31163 RUN "npm install" AFTER THIS GIT PULL!!
Integrated markdown parsing to all post content. Title content by default
not going to be parsed, using default options unless circumstances dictate
otherwise.
2013-05-02 20:35:42 -04:00
Baris Usakli
39b24436d0 removed global.socket, passing in socket to the functions now 2013-05-02 12:54:27 -04:00
psychobunny
1bec9fc5aa breadcrumbs, and changed home in nav to 'forum' 2013-05-01 21:52:40 +00:00
psychobunny
b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls 2013-05-01 21:26:47 +00:00
psychobunny
e658531a67 replies are up 2013-05-01 20:58:36 +00:00
psychobunny
1f97fefac0 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-01 18:25:29 +00:00
psychobunny
0f3f2bb859 post replies, unfinished 2013-05-01 18:25:24 +00:00
Julian Lam
62779ef0dd relative time on topics and posts 2013-05-01 14:23:57 -04:00
Baris Soner Usakli
20aa5d439e log server errors in browser
added uid to posts
2013-04-30 12:40:16 -04:00
psychobunny
19a63bf51b fix for threads that have 0 posts 2013-04-28 20:27:10 +00:00
psychobunny
126f817f7d updates to posts 2013-04-28 20:07:42 +00:00
psychobunny
98ca14e31c started working on threadss, implemented slug url, fixed crashing bug during post creation 2013-04-25 21:55:11 +00:00
psychobunny
d711a4e334 added post button, post window, added click handler to toaster alert, started on posts and topics schema and code 2013-04-24 20:40:34 +00:00