Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 05:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,333 Commits 75 Branches 483 Tags
00cb15d3c85cc251eecafac62d1f3d88aca7104b
Commit Graph

831 Commits

Author SHA1 Message Date
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
Julian Lam
194793d14d Merge branch 'master' into notifications 
Conflicts:
	src/websockets.js
 2013-05-23 08:21:36 -04:00
Julian Lam
6bae30336a foundation for user notifications 2013-05-22 21:43:01 -04:00
Baris Usakli
8d0ac4cb07 chat feature 2013-05-22 17:14:06 -04:00
Baris Usakli
40b2aa2a80 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-22 15:35:58 -04:00
Baris Usakli
9f8c9e8822 derp 2013-05-22 15:35:54 -04:00
Julian Lam
6cd65e6598 fixing motd so that it shows default motd if config is empty 2013-05-22 15:15:48 -04:00
Julian Lam
499f840e1e added toggle in config to switch on and off the motd 2013-05-22 12:11:44 -04:00
Julian Lam
16dac16d91 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-22 12:06:33 -04:00
Julian Lam
ec463ce3d3 added motd support 2013-05-22 12:06:23 -04:00
Baris Soner Usakli
760037ba0a added signature to new replies 2013-05-21 22:56:09 -04:00
Baris Soner Usakli
ef304a712f strip tags from signature when they are saving, separated info in user profile and added signature box 2013-05-21 22:36:21 -04:00
Julian Lam
26781157b3 refactoring posts, topics, and categories so that each "get" is moved up 
one level. Topics.get will get all of the posts in a tid, etc.
 2013-05-21 21:07:26 -04:00
Julian Lam
624ccc592c resolving issue where the post window stays open during navigation 
- app.close_post_window now neatly closes the post window
 2013-05-21 20:20:54 -04:00