Baris Soner Usakli
0edb895c2c
indent
2014-01-04 18:09:43 -05:00
Baris Soner Usakli
981719dee1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-04 18:05:22 -05:00
Baris Soner Usakli
1466e68aa1
ssl support 101
2014-01-04 18:05:15 -05:00
Julian Lam
f1412193ef
Merge branch 'master' of github.com:designcreateplay/NodeBB
2014-01-04 18:04:12 -05:00
Julian Lam
b6fdc5595d
removed handlebars dependency for emailer, using ANDREWBARS now
2014-01-04 18:03:54 -05:00
Baris Soner Usakli
487281cc7a
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-04 17:11:04 -05:00
Baris Soner Usakli
751dc73ebe
fixes login/register and auth routes in relative path install
2014-01-04 17:10:56 -05:00
psychobunny
7f8836daa4
simplified filter:server.create_routes - routes no longer require you to pass in req, res, name, route (the latter two was a mistake)
...
tl;dr - just content is all that is required. see
http://www.github.com/psychobunny/nodebb-plugin-static-page for more
info
2014-01-04 17:01:01 -05:00
Julian Lam
11ed9e8c85
tweaks to emailer, implemented emailer hook for password reset
2014-01-04 11:55:41 -05:00
Julian Lam
0ac9ec6001
Merge remote-tracking branch 'origin/master' into email-revamp
2014-01-04 11:19:23 -05:00
Baris Soner Usakli
ecb64a0aa2
removed extra ,
2014-01-04 02:10:37 -05:00
Baris Soner Usakli
8626122679
category active users are stored in a sorted set now
2014-01-04 01:15:41 -05:00
Baris Soner Usakli
fd20e4a400
5% more
2014-01-04 00:41:25 -05:00
Baris Soner Usakli
1a64e40b21
upgrade check
2014-01-04 00:38:43 -05:00
Baris Soner Usakli
f21a98f37f
first pass, #524 , #667
2014-01-03 21:33:41 -05:00
psychobunny
98a646fa62
changed numRecentTopics to numRecentReplies, that makes more sense now
2014-01-03 20:37:29 -05:00
psychobunny
1d69436b44
fix to getRecentReplies causing count = 0 to return unlimited
2014-01-03 20:36:00 -05:00
psychobunny
d6c7551120
pull # of recent replies based on settings
2014-01-03 20:29:09 -05:00
psychobunny
fb53e89023
upgrade.js - categories.numRecentTopics
2014-01-03 20:20:23 -05:00
Baris Soner Usakli
d0a2c077ff
refactored posts.create to use waterfall
2014-01-03 19:32:52 -05:00
psychobunny
9ef8bb4cdc
woops, fail at iteration
2014-01-03 17:22:23 -05:00
psychobunny
bc8a53aadd
upgrade.js - adding categories.class and categories.link
2014-01-03 17:09:19 -05:00
Julian Lam
d93163896f
Merge pull request #701 from aonz1982/install_automated_setup
...
Install automated setup
2014-01-02 18:47:38 -08:00
Julian Lam
cdb0b4b49e
Merge branch 'master' into email-revamp
2014-01-02 18:14:07 -05:00
Julian Lam
24944762d7
fixing 'back to nodebb' ext, and revamping email confirm logic
2014-01-02 16:26:56 -05:00
Baris Soner Usakli
9589d340b9
removed console.log
2014-01-02 16:00:24 -05:00
Baris Soner Usakli
91afbf106e
removed console.log
2014-01-02 16:00:05 -05:00
Baris Soner Usakli
aff11359ae
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-02 15:59:34 -05:00
Baris Soner Usakli
aff8cef5f3
closes #717
2014-01-02 15:59:25 -05:00
Julian Lam
d6e0625fc8
Merge remote-tracking branch 'origin/master' into email-revamp
2014-01-02 15:21:59 -05:00
psychobunny
2c398f81d2
fixed the twitter link to @NodeBB
2014-01-02 15:06:08 -05:00
Baris Soner Usakli
520fcadd3f
closes #456
2014-01-02 14:53:27 -05:00
Baris Soner Usakli
e8eb9f91b9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
2014-01-02 14:26:30 -05:00
Baris Soner Usakli
8bfb338eee
#712
2014-01-02 14:26:08 -05:00
cmastudios
e3185b9560
Calculate age based on days instead of years
...
Calculating the age based on the year only caused issues in the display of the age because it was off. Example: Person who was born in march of 1999 is displayed as 15 instead of 14 after the turn of the year.
2014-01-01 19:46:11 -05:00
Baris Soner Usakli
d0e4689907
removed extra event in websocket.js
2014-01-01 14:44:15 -05:00
Baris Soner Usakli
1996e64c9b
if imgur client id is not set but local file uploads are enabled use that
2014-01-01 14:38:12 -05:00
Baris Soner Usakli
e2fb617cc0
thread delete restore fix
2014-01-01 14:15:53 -05:00
Baris Soner Usakli
fd88aff195
mongo string fix
2014-01-01 14:11:12 -05:00
Julian Lam
f7a1cca861
properly fixed #713
2013-12-31 20:53:24 -05:00
Julian Lam
e3fb996a80
Merge branch 'master' of github.com:designcreateplay/NodeBB
2013-12-31 20:28:37 -05:00
Julian Lam
fe53037e53
hopefully fixing #713
2013-12-31 20:28:31 -05:00
Baris Soner Usakli
438f90d859
expire functionality in dbal
2013-12-31 19:08:38 -05:00
Julian Lam
339ed4e47b
implemented emailer for welcome email (though the email confirmation system is horribly broken)
2013-12-31 18:00:10 -05:00
Julian Lam
5a527de287
fixed debug output when plugin method is not found
2013-12-31 17:19:37 -05:00
Julian Lam
3ff550914f
Merge remote-tracking branch 'origin/master' into email-revamp
...
Conflicts:
package.json
2013-12-31 17:15:38 -05:00
Baris Soner Usakli
742c8fb43c
closes #712
2013-12-31 17:14:27 -05:00
Baris Soner Usakli
d43f3cebc6
closes #707 , closes #686
2013-12-31 17:01:51 -05:00
Baris Soner Usakli
1b41a8f467
fixed typo
2013-12-31 14:32:16 -05:00
Baris Soner Usakli
f933fc0167
forgot topics.js oops
2013-12-31 14:27:56 -05:00