Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,126 Commits 75 Branches 483 Tags
69373fded7ab1b51b9fc70e7bf12ab817dd95a2e
Commit Graph

20126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
psychobunny
b5622690e0 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-03 17:52:23 +00:00
psychobunny
c73d1237d2 started favourites/rep 2013-05-03 17:52:20 +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
Julian Lam
430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-03 13:06:26 -04:00
Julian Lam
bceaf67c20 INSTALL build-essential AND RUN npm install!!!! 
bcrypt integration
 2013-05-03 13:05:57 -04:00
Julian Lam
ba1001aac9 fixed alternative login css 2013-05-03 13:02:36 -04:00
psychobunny
2bc9876852 fixed ready_callback bug 2013-05-03 16:48:49 +00:00
psychobunny
d622c9e100 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-03 16:43:26 +00:00
psychobunny
edf58693cc added real username to posts 2013-05-03 16:43:07 +00:00
Baris Usakli
7dc9fd83c1 account page shows up when logged in and 403 when logged out 2013-05-03 12:27:07 -04:00
psychobunny
b97157d8fd fixed topic name bug 2013-05-03 16:23:26 +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
Baris Usakli
ed26728a0f show username on homepage 2013-05-03 11:43:01 -04:00
psychobunny
abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-03 15:01:59 +00:00
psychobunny
9fe73d68fc style changes to topics 2013-05-03 15:01:56 +00:00
Julian Lam
00f7347575 css cleanup 2013-05-02 20:56:18 -04:00
Julian Lam
6d36df1604 tweaking users/* calls 2013-05-02 20:45:45 -04: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
ad2021df04 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 16:28:35 -04:00
Baris Usakli
7f12d568ff user name on home.tpl 2013-05-02 16:28:04 -04:00
Julian Lam
daa01d07d2 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-02 16:15:53 -04:00
Julian Lam
d5dc81b63c social icons 2013-05-02 16:15:48 -04:00
psychobunny
9e7654fa9a template example for user 2013-05-02 20:11:14 +00:00
Baris Usakli
bff02a7f2e Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 16:00:45 -04:00
Baris Usakli
de28d8af55 token bug 2013-05-02 16:00:24 -04:00
Julian Lam
0929800d96 Merge branch 'master' of github.com:psychobunny/node-forum 
Conflicts:
	src/webserver.js
 2013-05-02 15:58:26 -04:00
Julian Lam
9c05a76fcb facebook integration 2013-05-02 15:57:43 -04:00
psychobunny
5988573d1c added check for google key 2013-05-02 19:51:28 +00:00
psychobunny
c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum 
Conflicts:
	public/css/style.less
	src/webserver.js
 2013-05-02 19:48:14 +00:00
Baris Usakli
6a58622857 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 15:45:43 -04:00
psychobunny
517b4de2fe threads look awesome now 2013-05-02 19:45:22 +00:00
Baris Usakli
44485a2e40 fixed session ids 2013-05-02 15:45:19 -04:00
Julian Lam
4c41011d83 minor stylistic change to header 2013-05-02 14:51:57 -04:00
Julian Lam
bef0bd87da Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-02 14:47:22 -04:00
Julian Lam
8be3b8c05e accidentally developed on a merge commit... *fingers crossed* 
Merge branch 'master' of github.com:psychobunny/node-forum

Conflicts:
	public/templates/login.tpl
 2013-05-02 14:47:00 -04:00
Baris Usakli
8cedb33c82 Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 12:56:17 -04:00
Baris Usakli
39b24436d0 removed global.socket, passing in socket to the functions now 2013-05-02 12:54:27 -04:00
Julian Lam
32d9b5349e beginning google integration 2013-05-02 12:45:22 -04:00
psychobunny
c73feeea2a hide alternate login strategies if config is not set 2013-05-02 16:36:26 +00:00
Julian Lam
417e722ae7 Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-02 12:17:45 -04:00
Julian Lam
60c1e937a1 tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server 2013-05-02 12:13:06 -04:00
Baris Soner Usakli
06d013e6de Merge branch 'master' of https://github.com/psychobunny/node-forum 2013-05-02 11:42:10 -04:00
Baris Soner Usakli
a47491225a clear topic and content after post 2013-05-02 11:40:00 -04:00
Julian Lam
5708076137 enabling twitter login 2013-05-02 11:35:15 -04:00
Julian Lam
8e5714cab4 skeleton for twitter integration via passport 2013-05-02 11:11:10 -04:00
Julian Lam
69bafcf19c refactoring register to use form post instead of socket (for passport integration) 2013-05-02 10:15:55 -04:00
Julian Lam
4c80e4f37d minor style changes to header 2013-05-02 09:49:52 -04:00