Commit Graph

727 Commits (b65f2bf97da0284aea5161bf36b8b89e5271307f)
 

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
Julian Lam eb15bd5ac0 cleanup moar
Julian Lam 0859793b15 cleanup
Julian Lam 180bec7349 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam f216c7f94a some cleanup and fixing breaking bug introduced by merge
Julian Lam 23e759fc83 some cleanup and fixing breaking bug introduced by merge
Julian Lam 878a678643 Merge branch 'install_script'
psychobunny bc16d530d8 feed.js
psychobunny bcc903ee1c run npm install. starting rss atom feeds of topics. fixed bug in topics where new topics created were not being saved properly
Julian Lam 88bf9425db install script + patching up integration with install wizard
Julian Lam 5d7ec10aae Merge branch 'master' into install_script
psychobunny 501cda24de schema.js
psychobunny 523ce61d1f redis schema file for organization; moved new topic button in categories higher
Julian Lam 069cf5c6cb minor tweak to 'start' button at end of install wizard
Julian Lam 65b6010d74 installation wizard under /install
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
Julian Lam 405318844f allowing multiple less files to compile down to one
psychobunny 39b46eb125 prevent crash on getRecentReplies, and styled recent replies
psychobunny 8c2b6cda69 added timestamp to teaser, continuing work on recent replies block
Baris Usakli 8a2499a423 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli a4fd54a0c3 topic titles can be edited now
Julian Lam 00a9ec0f12 interim commit
psychobunny 6db259cf3f Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Conflicts:
	src/posts.js
psychobunny 448673b141 recent replies part 2
Baris Usakli adb52023b8 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli db6bbcc699 post every x seconds added it x to config
Julian Lam 6060f4fbb4 Merge branch 'master' of github.com:psychobunny/node-forum
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
Baris Usakli eeb70b17ba Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli da46a73efe looks better without disconnect alert
psychobunny 55c704c6f9 hide category blocks in recent tab
Baris Usakli 6465b1aff7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 2d90635dc8 added 500ms delay to disconnect message
psychobunny af7550ca30 console.log
psychobunny 06aa2337d1 admincategories.js
psychobunny a02a74604c moved CategoriesAdmin into its own file, hid popular/active, some jslinting + cleanup, renamed some fn calls to be more descriptive
psychobunny 55cb790d3c potential fix for duplicate chat results, started recent replies block
Julian Lam 786baa8fe0 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 289219d0ee adding email header and footer
psychobunny deaf8105cc renamed get category to get categories
psychobunny 43614a5197 fixed breaking issue on empty category
psychobunny 4b67f8573e recent posts done (needs polish/cleanup), and fixed bug where new topic button was not showing up in categories
Julian Lam 6acc07920e Updated README.md
psychobunny c785f06367 added 404 tpl, fix for 404 on topics, continuing refactor - categories
Baris Usakli 8f281e9792 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 0f2014193d top bar fix
Julian Lam d71a38c4f7 minor styling changes to notif window
Julian Lam e6218bb74a Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 2a829a0618 derpy globals to get notification pushing working for sockets on new notification event
Baris Usakli c02e235005 border radius 0px on home