Commit Graph

456 Commits (38886f6b582d0ce73553d9c52098d6eb47f58b6a)

Author SHA1 Message Date
psychobunny cd4ca110a1 moved utils over to client side for code sharing
Julian Lam 78713f0599 Merge remote-tracking branch 'origin' into notifications
Baris Usakli acd797fe20 changed github link on home
Julian Lam c8d48127ad more changes to notification dropdown in header bar
Julian Lam 6bae30336a foundation for user notifications
Julian Lam 6cd65e6598 fixing motd so that it shows default motd if config is empty
Julian Lam 499f840e1e added toggle in config to switch on and off the motd
Julian Lam ec463ce3d3 added motd support
Julian Lam 26781157b3 refactoring posts, topics, and categories so that each "get" is moved up
one level. Topics.get will get all of the posts in a tid, etc.
Julian Lam 624ccc592c resolving issue where the post window stays open during navigation
- app.close_post_window now neatly closes the post window
psychobunny 34133eef8c post counts + read status working on homepage category listing. fixed posts.get_cid_by_pid
Julian Lam 7c165876f1 fixed bug where deleted posts still showed up in teasers
psychobunny cb6d98cecb derp conflicts
Merge branch 'master' of https://github.com/psychobunny/NodeBB

Conflicts:
	public/src/templates.js
psychobunny fb52dfc6c8 templates refactor part 2
updated so that tpls get loaded on demand as opposed to all at once on
load; added a function to pull the tpl list on load instead of having to
manually define new templates in code; some clean up; added utils.walk;
Julian Lam 7d648e7abe Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 297c4b8173 socketizing topic creation so that a new topic shows up automatically when one is created
psychobunny 1cdbd376ba deprecated server side templates finally. code sharing between client side and server side templates; force_refresh parameter added to temasd
deprecated server side templates finally. code sharing between client
side and server side templates; force_refresh parameter added to
templates config.json; created initialization fn for webserver
Julian Lam 4b6ad9607e removing static saving of recent post, and added in dynamic pulling on Topics.get
Julian Lam e256ee99f7 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bdeb7b13f1 interim commit for moderator support
Baris Usakli 34432773d6 fix crash when you go to /topics/nonexistant
psychobunny 91b4ec2547 fixed crashing error in graph/user/picture, and started updating the main post row in topic.tpl
psychobunny 25e218442a updated category: tracking active participants + removed placeholder; recent author picture now pulled dynamically; graph/users/picture implemented
Baris Usakli 073b87982b moved user routes into routers/user.js
Baris Usakli 188b1d5ada for andrew
Baris Usakli 4c324664fa removed global modules
Baris Usakli d564811b71 fixed the data passing to accountedit.tpl
Baris Soner Usakli 0bb0fd5789 removed debug console.logs
Baris Soner Usakli 901b378912 css fix
Baris Soner Usakli 62bffff3c7 forgot to add a ;
Baris Soner Usakli 71d595a552 debug image uploading
Julian Lam aab149aecf Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 80b20fe877 adding alternate logins to register page
Baris Soner Usakli eccd1f66d1 removed some debug stuff from image upload
Baris Soner Usakli 5796140f58 image upload changes
Baris Soner Usakli 5785b16ae9 fixed users page so that all reps and post counts are comma delimited, some image upload fixes
Baris Soner Usakli e476e27807 image upload error msgs, file size limit
Baris Soner Usakli 0aeeac9d61 image upload and changing images will clean up later andrew stayla
Baris Soner Usakli 7d27a7c6d3 changed user update profile so that it only updates specific fields, before it was possible to send in rep,post count
Julian Lam e9a552eab4 editing of posts
psychobunny f218e0f3a7 user has read feature - turns post count badge red if there is a new post and grey if the user has seen this post already
psychobunny a4e8f9e706 cleaned up webserver a bit, moved over authentication stuff into its own file, got rid of unused routes, user routes still need to be moved out but am waiting for baris to finish
psychobunny 30323fa29f Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny f3f08a9c94 more fixes to ajaxify, updated /users blocks to sit flush to the left, started work on the ACP including basic templates, added a method to get active users in all rooms (socket connections), added more routes mostly pointing to admin, added a routing folder to start organizing routes better, starting with admin.
Baris Usakli 5057af7bbe user edit fix for !==
Baris Usakli 44f0183b29 fixed anon users visiting user profiles
Baris Usakli 2539079c84 removed console.log
Baris Usakli 9166a9ccde user edit changes
Baris Usakli 0210e5a928 edit
Baris Usakli 9494bf6378 edit restrict
Baris Usakli 5edf7efd8f user edit and profile changes
Baris Usakli 187d5a101a edit page
Baris Usakli 36e7baa84d userS
Baris Usakli 5e36ca2fbe removed dupe function
Baris Usakli d308242d2d decimal places for rep and post count
Baris Soner Usakli 6dda6ce15b removed some console.logs
Baris Soner Usakli 8710aa3457 users page
psychobunny e061fe061b added custom routing from server side, started moving hardcoded scripts into create_route
psychobunny e75076caad Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 09c6aace09 custom template half in
Baris Usakli 781d7cf9cf template stuff
Baris Usakli bf731dc224 user edit
Baris Usakli cef1ba4c08 changed profile page to /users/username
Baris Usakli 0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 91d9775cc4 fixed slugs from disappearing if f5ing
Baris Usakli 283dbc477b Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 6a6eeae426 edit changes
Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
psychobunny ace64cec7b Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 31542cd9be finished recent, popular and active posts shells, just need to update api methods
Baris Usakli ec104b05d4 added links to user profiles from posts and the breadcrumbs
psychobunny 6dfc44c63c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/webserver.js
psychobunny 5153aa7652 added template mapping, did users->account
Baris Usakli 49cb5fddcd removed some console.log
Baris Usakli ec754d601d users profile page, need to add templates
Julian Lam b2c6d4f7c7 interim commit to thread options
Julian Lam d7c5a3c150 merging from stash
psychobunny fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
Julian Lam 4f38bb10e8 Merge remote-tracking branch 'origin'
Julian Lam b6f3211ce7 if a thread is locked, the reply buttons all now say "locked", and the
post reply window will not pop up
Baris Soner Usakli da837f662a redirect /login and /register to /account if user is already logged in
Julian Lam 30bf27f1c7 Merge remote-tracking branch 'origin' into posts-refactor
Julian Lam 08c303b3c7 interim commit
psychobunny 8a2c18de5b fixed ajaxify bug that was rendering pages twice (solved flicker issue); fixed entering rooms that was casuing rep/streaming posts to not work; fixed /accounts to work by adding get data route; fixed bug that preventing gravatars from loading if there was more than one post in the thread
Baris Soner Usakli c906b7419a added reputation to /account
Baris Soner Usakli fee76db8dc more fixes
Baris Soner Usakli 954392e4c4 fixes to gravatars and get functions in user.js
Baris Soner Usakli 08f7b64ccf hash changes to user data
Julian Lam 1fc6e0db2c added email verification on registration
added email header and footer
Baris Soner Usakli 73e958e627 added join date to users, fixed post count when a new topic is created. account page shows time joined,picture and name
psychobunny 69565b0ded fixed a bug where anonymous users couldnt access topics
psychobunny 3e96f64191 streaming posts. also moved topics to be entirely client side parsed. made some changes. added block level caching to templates. added a prepare method to templates
psychobunny bcb672e1fe socket rooms! and almost finished rep (socket updates) except for one small bug where current_user isnt being pulled
Baris Usakli 7dc9fd83c1 account page shows up when logged in and 403 when logged out
Julian Lam 6d36df1604 tweaking users/* calls
Julian Lam 9c05a76fcb facebook integration
psychobunny c113f4151b Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	public/css/style.less
	src/webserver.js
psychobunny 517b4de2fe threads look awesome now
Julian Lam 8be3b8c05e accidentally developed on a merge commit... *fingers crossed*
Merge branch 'master' of github.com:psychobunny/node-forum

Conflicts:
	public/templates/login.tpl
Julian Lam 32d9b5349e beginning google integration
psychobunny c73feeea2a hide alternate login strategies if config is not set
Julian Lam 60c1e937a1 tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
Julian Lam 8e5714cab4 skeleton for twitter integration via passport
Julian Lam 69bafcf19c refactoring register to use form post instead of socket (for passport integration)
Julian Lam 09fb79d3a2 integrated LESS middleware to static served CSS/less files
Julian Lam c7fb07e2e5 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	public/templates/header.tpl
	src/webserver.js
Julian Lam 3ca880d81e interim commit
Julian Lam de26a303d4 housekeeping
Julian Lam a537c4d805 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam d712f57141 refactored user authentication (passport-local, instead of my own
half-baked implementation)
psychobunny 9119a9d104 small refactor of routing, cleanup, templates are now parsed entirely on client side for /, /register, /login for now
psychobunny b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
Julian Lam 70d3105a8e configuring express session to use a secret defined in the config file,
not a hard coded one
Julian Lam 924618fc29 removed account_settings template
Julian Lam c298e7002e updated configuration file with redis params, and updated all redis wrapper to read configs from config file instead of defaulting to localhost -- same for express.session store
Baris Soner Usakli 1fb99ab848 fixed the crash when going between pages, return next() in webserver.js
Julian Lam 58642b1e7b removed requireAuth middleware
Julian Lam 2358528880 merging changes for stash pop
psychobunny 1037088643 commented out breaking code regarding user var
psychobunny 303452ef8c fixed conflicts
psychobunny 126f817f7d updates to posts
Julian Lam f4b14df195 some more fixes to the session handling to ignore the /api folder, and
refactoring how the public directory is set up in webserver.js.

THIS COMMIT ALTERS NODEBB'S DEPENDENCIES!
Please run npm install after pulling.
Julian Lam 19cd9e05ed fixing login and logout sessions
psychobunny 7f4ea6e19b Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 98ca14e31c started working on threadss, implemented slug url, fixed crashing bug during post creation
Julian Lam 2a9c33b9f8 user activity counter (bug present where all users register as same session? this isn't good....)
psychobunny 880d6832be Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 5173498180 client side templates in, fixed home page to parse templates on ajaxify, added footer to the page transition animation for smoothness
Julian Lam 81364580ed new 403 page
Julian Lam f774974803 logout functionality
Julian Lam 8d4fb77565 NEW DEPENDENCY: connect-redis
Persistent sessions with connect-redis.
Julian Lam eac3785b29 fixing issue with auth (removed session saving stuff by mistake)
Julian Lam 3eb4f0e1a2 commenting out global.uid setting
Julian Lam 9e5a7b96b3 fixed broken mget implementation if no topics are present
psychobunny a16f72e11c redis - added mget and multi, finished initial topics listview on home page, finished get topics method calls
psychobunny 877219cb58 fixed conflicts
Julian Lam 0985087f5d auth...
Julian Lam 71e410d571 Merge branch 'master' of github.com:psychobunny/node-forum
Conflicts:
	src/webserver.js
Julian Lam c1186f396e some work on session login etc
psychobunny d711a4e334 added post button, post window, added click handler to toaster alert, started on posts and topics schema and code
Julian Lam dea9a707dc interim commit for password reset
Julian Lam e56e7b549b more stuff on pw reset
Julian Lam 9fcbca8da9 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam a73481af8b more work with reset page
psychobunny 67bf1b6041 updated ajaxify to do a callback after page change, added toaster style notifications (app.alert), changes to webserver to update automatically
Julian Lam 0e8c4f35cd socketing for reset page - started on emailer
Julian Lam f975105176 added email to registration fields, email existence check
Julian Lam 2d8725d522 changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)
Julian Lam d035307d8b changing the way the express app is instantiated
Julian Lam 302d1a3131 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam f894eae34f tweaks
psychobunny 65b035c9c9 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 3d81f129e3 added login, fixed gitignore
Julian Lam 1d3d3df73b optimizing for express, tweaks to config file
Julian Lam a2d727dd86 setting up config file for use in app, updated readme
psychobunny b04d262fe4 init, just some testing