Commit Graph

4277 Commits

Author SHA1 Message Date
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
psychobunny
55c704c6f9 hide category blocks in recent tab 2013-05-24 11:44:31 -04:00
Baris Usakli
6465b1aff7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-24 11:39:41 -04:00
Baris Usakli
2d90635dc8 added 500ms delay to disconnect message 2013-05-24 11:39:30 -04:00
psychobunny
af7550ca30 console.log 2013-05-24 11:38:16 -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
Julian Lam
786baa8fe0 Merge branch 'master' of github.com:designcreateplay/NodeBB 2013-05-24 08:39:45 -04:00
Julian Lam
289219d0ee adding email header and footer 2013-05-24 08:39:39 -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
Julian Lam
6acc07920e Updated README.md 2013-05-23 21:06:56 -04:00
psychobunny
c785f06367 added 404 tpl, fix for 404 on topics, continuing refactor - categories 2013-05-23 16:53:25 -04:00
Baris Usakli
8f281e9792 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2013-05-23 16:35:39 -04:00
Baris Usakli
0f2014193d top bar fix 2013-05-23 16:35:34 -04:00
Julian Lam
d71a38c4f7 minor styling changes to notif window 2013-05-23 16:03:45 -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
Baris Usakli
c02e235005 border radius 0px on home 2013-05-23 15:44:00 -04:00