Commit Graph

906 Commits

Author SHA1 Message Date
psychobunny
bb8f75b4be merged.. conflicted up the ass. registration looks gud again 2013-08-29 03:01:58 +08:00
Baris Soner Usakli
87f48e2cc9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-28 13:48:05 -04:00
Baris Soner Usakli
cc55073107 issue #224 2013-08-28 13:47:52 -04:00
Julian Lam
96c43b4607 fixed #221 - issue where replies would not automatically refresh a post after editing 2013-08-28 12:29:15 -04:00
Julian Lam
f1b4367168 closed #180, closed #223 2013-08-28 11:00:34 -04:00
Julian Lam
4416f8530d matching connect-redis session with cookie ttl 2013-08-28 10:18:17 -04:00
Baris Soner Usakli
4e48ab2363 changed max age to milliseconds 2013-08-27 23:40:38 -04:00
Baris Usakli
c262027728 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 15:55:48 -04:00
Baris Usakli
6a08fedf18 closes #210 2013-08-27 15:55:44 -04:00
Julian Lam
97641dbcda fixing teasers, that I broke in the last commit 2013-08-27 15:00:35 -04:00
Julian Lam
54fdbcd947 fixing broken category 2013-08-27 14:57:21 -04:00
Julian Lam
5f0e0c993e adding localhost as default for email server 2013-08-27 14:16:56 -04:00
Baris Usakli
1c27cbd90a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 14:04:25 -04:00
Baris Usakli
4b4b26651a derp 2013-08-27 14:04:22 -04:00
Julian Lam
1a6ba8c230 fixed derpiness I introduced last commit 2013-08-27 14:04:09 -04:00
Julian Lam
8d04454457 closed #218 2013-08-27 13:52:30 -04:00
Baris Usakli
08ba911738 closes #216 2013-08-27 13:38:09 -04:00
Baris Usakli
59f4b6788a Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-27 13:32:54 -04:00
Baris Usakli
a317a4d689 closes #206 2013-08-27 13:32:43 -04:00
Julian Lam
860a83ba90 closed #212 2013-08-27 13:04:18 -04:00
Julian Lam
abce5fd120 refactored postTools.toHTML to fire post.parse hook, and removed auto-markdowning
closed #214
2013-08-27 12:50:15 -04:00
Julian Lam
0243e9c5be issue #214, preparing for addition of post.parse hook by renaming markdownToHTML to just "toHTML", and making it asynchronous. 2013-08-27 12:14:27 -04:00
Baris Usakli
8a4a0154f6 closes #211, closes #213 2013-08-27 12:10:23 -04:00
psychobunny
469a5221ed added postcount to topics return; started scrollspy behaviour for "postid / postcount" in topics. 2013-08-27 06:36:49 +08:00
psychobunny
f251b9c6c5 Merge branch 'master' into bootstrap3 2013-08-27 06:03:05 +08:00
psychobunny
cc6e028b1d fixed alert-notify (and blanks) to alert-warning 2013-08-27 05:16:49 +08:00
Julian Lam
ece2edf579 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-26 16:37:37 -04:00
Julian Lam
1961f01cab possibly fixing issue #203 2013-08-26 16:37:22 -04:00
psychobunny
fe89f1f096 added a .hidden-mobile class for inline block elements. also removed button text on jumbotron for mobile devices 2013-08-27 04:37:16 +08:00
Baris Usakli
4a214b6ef0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 16:04:37 -04:00
Baris Usakli
dda429ab5d unread count shows total 2013-08-26 16:04:31 -04:00
Julian Lam
15feaafd68 attempting fix for #179, @barisusakli can you pull and test if this is still present? 2013-08-26 15:20:06 -04:00
Julian Lam
14e7907e06 closed #201 2013-08-26 14:56:00 -04:00
Baris Usakli
b4b483b35a removed console.log 2013-08-26 13:21:14 -04:00
Baris Usakli
a6837a7869 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 13:18:29 -04:00
Baris Usakli
0a485a7ff6 closes #109 2013-08-26 13:18:20 -04:00
Julian Lam
bca1602474 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-26 12:24:16 -04:00
Julian Lam
96ee0a2017 closed #184 2013-08-26 12:22:55 -04:00
Baris Usakli
25550e18d0 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-08-26 11:59:02 -04:00
Baris Usakli
154d0160bc closes #200 2013-08-26 11:58:52 -04:00
Julian Lam
aefa56221b closed #202 2013-08-26 11:56:28 -04:00
Baris Soner Usakli
dd40cbc139 check if topicData is valid 2013-08-24 18:51:24 -04:00
Baris Soner Usakli
23db2e5c9e better fix for #198 2013-08-24 18:47:10 -04:00
Baris Soner Usakli
eff1b174c0 closes #198 2013-08-24 18:43:06 -04:00
Baris Soner Usakli
545069b069 closes #199 2013-08-24 18:19:01 -04:00
Julian Lam
f767535ce5 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-08-23 16:25:22 -04:00
Julian Lam
aeebd069e2 fixing nconf issue where redis js was requiring redis configs before they were defined 2013-08-23 16:25:16 -04:00
psychobunny
0f8aad52b2 updated all alert-error to alert-danger (wtf did BS3 need to change that?) 2013-08-24 03:36:44 +08:00
Julian Lam
d2aa2a9a29 derpiness 2013-08-23 15:22:26 -04:00
psychobunny
a482d4db5f fixed /recent, /unread 2013-08-24 03:10:15 +08:00