Commit Graph

1497 Commits

Author SHA1 Message Date
Julian Lam
3848115afe Merge branch 'master' of github.com:psychobunny/node-forum 2013-05-29 14:36:35 -04:00
Julian Lam
68b7609ab6 identicon integration for twitter + fixing missing social icons for registration page 2013-05-29 14:36:01 -04:00
psychobunny
d76432a20f console.log 2013-05-29 14:15:32 -04:00
Julian Lam
fa15f2e4d5 tweak to less file 2013-05-29 13:20:07 -04:00
Julian Lam
c63d6f75c2 updating social login icons to use font-awesome equivalents instead of (possibly) proprietary icons 2013-05-29 13:15:30 -04:00
psychobunny
f05b5165c5 fix for footer js not executing on non-root 2013-05-29 12:32:59 -04:00
psychobunny
6dd8264685 updated to latest font-awesome (3.11) 2013-05-29 12:23:42 -04:00
psychobunny
8a939fa4cc removed left over template variable in category.js 2013-05-29 12:22:04 -04:00
psychobunny
34131ad46c modified exec_body_scripts to load external scripts. finally moved all the js files out of tpls into their own js
todo: still need to organize the individual scripts client side,
2013-05-29 12:17:44 -04:00
psychobunny
9c546c92ad removed alert 2013-05-29 11:55:46 -04:00
psychobunny
392883b911 bugfix: show post row for new topic on previously empty category 2013-05-28 15:10:09 -04:00
psychobunny
11ad3a867e fixed slug issue with topics 2013-05-28 14:51:49 -04:00
psychobunny
f9e015f194 cid undefined bug 2013-05-28 14:26:00 -04:00
Julian Lam
c66885af51 fixing build_header misdef 2013-05-28 14:11:27 -04:00
Julian Lam
92aaeca899 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-28 12:32:13 -04:00
Julian Lam
48bccb3498 applying custom theme (if enabled) to all routes 2013-05-28 12:31:55 -04:00
psychobunny
82e8b481b8 fixed posting bug and moved new topic button to be visible if no topics found 2013-05-28 16:11:29 +00:00
Julian Lam
7f77ec2c5f committing hotfix to registration 2013-05-28 11:50:09 -04:00
Julian Lam
dec9a3bef9 adding missing admin css file, some other tweaks and cleanup 2013-05-28 11:05:27 -04:00
Julian Lam
c1755d0dba theming 'try it' support for ACP 2013-05-28 00:08:35 -04:00
Julian Lam
111b9dcf0a moved admin css to its own file for LESS compilation, and adding in
options to update social keys for login
2013-05-27 18:06:03 -04:00
Julian Lam
eb15bd5ac0 cleanup moar 2013-05-27 16:42:12 -04:00
Julian Lam
0859793b15 cleanup 2013-05-27 16:37:31 -04:00
Julian Lam
180bec7349 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-27 16:17:46 -04:00
Julian Lam
f216c7f94a some cleanup and fixing breaking bug introduced by merge 2013-05-27 16:17:38 -04:00
Julian Lam
23e759fc83 some cleanup and fixing breaking bug introduced by merge 2013-05-27 16:17:19 -04:00
Julian Lam
878a678643 Merge branch 'install_script' 2013-05-27 16:07:07 -04:00
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
069cf5c6cb minor tweak to 'start' button at end of install wizard 2013-05-25 20:42:27 -04:00
Julian Lam
65b6010d74 installation wizard under /install 2013-05-25 20:32:22 -04:00
psychobunny
d36a81966a use ajaxify to load 404 (prevents weird refreshing bug); part 1 of client side refactor: moving all template javascript vars into dom;
templates.get, templates.set for dynamic variables populated via tpls
2013-05-24 23:02:21 -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
Baris Usakli
eeb70b17ba Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-24 11:49:34 -04:00
Baris Usakli
da46a73efe looks better without disconnect alert 2013-05-24 11:49:24 -04:00