psychobunny
|
bc16d530d8
|
feed.js
|
2013-05-27 14:55:07 -04:00 |
|
psychobunny
|
bcc903ee1c
|
run npm install. starting rss atom feeds of topics. fixed bug in topics where new topics created were not being saved properly
|
2013-05-27 14:55:03 -04:00 |
|
Julian Lam
|
88bf9425db
|
install script + patching up integration with install wizard
|
2013-05-27 14:02:57 -04:00 |
|
Julian Lam
|
5d7ec10aae
|
Merge branch 'master' into install_script
|
2013-05-27 11:45:58 -04:00 |
|
psychobunny
|
501cda24de
|
schema.js
|
2013-05-27 11:29:26 -04:00 |
|
psychobunny
|
523ce61d1f
|
redis schema file for organization; moved new topic button in categories higher
|
2013-05-27 11:29:05 -04:00 |
|
Julian Lam
|
65b6010d74
|
installation wizard under /install
|
2013-05-25 20:32:22 -04:00 |
|
Julian Lam
|
405318844f
|
allowing multiple less files to compile down to one
|
2013-05-24 15:38:23 -04:00 |
|
psychobunny
|
39b46eb125
|
prevent crash on getRecentReplies, and styled recent replies
|
2013-05-24 15:05:59 -04:00 |
|
psychobunny
|
8c2b6cda69
|
added timestamp to teaser, continuing work on recent replies block
|
2013-05-24 14:35:07 -04:00 |
|
Baris Usakli
|
8a2499a423
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2013-05-24 14:29:40 -04:00 |
|
Baris Usakli
|
a4fd54a0c3
|
topic titles can be edited now
|
2013-05-24 14:29:35 -04:00 |
|
Julian Lam
|
00a9ec0f12
|
interim commit
|
2013-05-24 13:14:41 -04:00 |
|
psychobunny
|
6db259cf3f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Conflicts:
src/posts.js
|
2013-05-24 12:53:45 -04:00 |
|
psychobunny
|
448673b141
|
recent replies part 2
|
2013-05-24 12:46:19 -04:00 |
|
Baris Usakli
|
adb52023b8
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2013-05-24 12:32:34 -04:00 |
|
Baris Usakli
|
db6bbcc699
|
post every x seconds added it x to config
|
2013-05-24 12:32:28 -04:00 |
|
Julian Lam
|
6060f4fbb4
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
2013-05-24 12:13:31 -04:00 |
|
Julian Lam
|
33f8ee57bf
|
revamped social auth code so that accounts are merged if they share a common email
also updated auth code so that fbid gplusid and twid are saved in the hash instead of as simple key->value
|
2013-05-24 12:12:59 -04:00 |
|
psychobunny
|
55c704c6f9
|
hide category blocks in recent tab
|
2013-05-24 11:44:31 -04:00 |
|
psychobunny
|
06aa2337d1
|
admincategories.js
|
2013-05-24 11:18:41 -04:00 |
|
psychobunny
|
a02a74604c
|
moved CategoriesAdmin into its own file, hid popular/active, some jslinting + cleanup, renamed some fn calls to be more descriptive
|
2013-05-24 11:18:28 -04:00 |
|
psychobunny
|
55cb790d3c
|
potential fix for duplicate chat results, started recent replies block
|
2013-05-24 09:00:11 -04:00 |
|
psychobunny
|
deaf8105cc
|
renamed get category to get categories
|
2013-05-24 08:34:13 -04:00 |
|
psychobunny
|
43614a5197
|
fixed breaking issue on empty category
|
2013-05-24 07:52:26 -04:00 |
|
psychobunny
|
4b67f8573e
|
recent posts done (needs polish/cleanup), and fixed bug where new topic button was not showing up in categories
|
2013-05-24 07:52:25 -04:00 |
|
psychobunny
|
c785f06367
|
added 404 tpl, fix for 404 on topics, continuing refactor - categories
|
2013-05-23 16:53:25 -04:00 |
|
Julian Lam
|
e6218bb74a
|
Merge branch 'master' of github.com:psychobunny/node-forum
|
2013-05-23 15:54:17 -04:00 |
|
Julian Lam
|
2a829a0618
|
derpy globals to get notification pushing working for sockets on new notification event
|
2013-05-23 15:53:55 -04:00 |
|
psychobunny
|
4a3ffec29f
|
proof that comments can be misleading
|
2013-05-23 15:23:43 -04:00 |
|
Baris Usakli
|
99eb9f8399
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2013-05-23 15:17:29 -04:00 |
|
Baris Usakli
|
a4e10076cc
|
assorted
|
2013-05-23 15:17:18 -04:00 |
|
psychobunny
|
1f99666d9f
|
moved favourites code out of posts
|
2013-05-23 15:11:55 -04:00 |
|
psychobunny
|
d0646ba98f
|
typo
|
2013-05-23 14:57:08 -04:00 |
|
Julian Lam
|
bafac00232
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/websockets.js
|
2013-05-23 14:56:23 -04:00 |
|
Julian Lam
|
35dae6c0ec
|
updating web sockets so that all connections are stored in a userSockets array
|
2013-05-23 14:55:05 -04:00 |
|
Baris Usakli
|
b0be1fab16
|
notifications in chat messages
|
2013-05-23 14:53:50 -04:00 |
|
Julian Lam
|
e159d70353
|
Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
src/websockets.js
|
2013-05-23 14:38:53 -04:00 |
|
psychobunny
|
c64b227a9d
|
odd - utils.js
|
2013-05-23 14:35:20 -04:00 |
|
Julian Lam
|
7e46f8c6ce
|
uniqueId support in notifications
|
2013-05-23 13:48:42 -04:00 |
|
psychobunny
|
044206ad17
|
misc cleanup in categories
|
2013-05-23 13:39:00 -04:00 |
|
Julian Lam
|
681bf270a1
|
hotfix to path to utils
|
2013-05-23 13:29:21 -04:00 |
|
Julian Lam
|
1f7ab82f78
|
Merge remote-tracking branch 'origin' into notifications
Conflicts:
src/webserver.js
|
2013-05-23 13:24:27 -04:00 |
|
psychobunny
|
cd4ca110a1
|
moved utils over to client side for code sharing
|
2013-05-23 13:21:46 -04:00 |
|
Julian Lam
|
78713f0599
|
Merge remote-tracking branch 'origin' into notifications
|
2013-05-23 13:13:35 -04:00 |
|
Baris Usakli
|
acd797fe20
|
changed github link on home
|
2013-05-23 13:04:25 -04:00 |
|
Julian Lam
|
ffbafc99c4
|
Merge remote-tracking branch 'origin' into notifications
Conflicts:
public/css/style.less
public/src/app.js
src/websockets.js
|
2013-05-23 12:56:55 -04:00 |
|
Julian Lam
|
c8d48127ad
|
more changes to notification dropdown in header bar
|
2013-05-23 12:54:57 -04:00 |
|
psychobunny
|
9503aa9a57
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
2013-05-23 12:52:23 -04:00 |
|
psychobunny
|
a9672ab9d8
|
begin refactor of posts/topics + pagination + cleanup + async
|
2013-05-23 12:52:16 -04:00 |
|