Commit Graph

285 Commits (26781157b340acf4dc66d5023c9a15289271962f)

Author SHA1 Message Date
Baris Usakli 7dc9fd83c1 account page shows up when logged in and 403 when logged out
psychobunny b97157d8fd fixed topic name bug
psychobunny e766cc0c64 more style updates to topic + very basic quoting feature in, needs to be looked at in future
Baris Usakli ed26728a0f show username on homepage
psychobunny 9fe73d68fc style changes to topics
Baris Usakli ad2021df04 Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli 7f12d568ff user name on home.tpl
Julian Lam daa01d07d2 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam d5dc81b63c social icons
psychobunny 9e7654fa9a template example for user
Baris Usakli bff02a7f2e Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli de28d8af55 token bug
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 5708076137 enabling twitter login
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 4c80e4f37d minor style changes to header
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 829dae05c5 updating header to show user label when logged in, and register/login when
not
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 1bec9fc5aa breadcrumbs, and changed home in nav to 'forum'
psychobunny b2bc967e9b got ajaxify working with threads, some cleanup, fixed anon posting, got rid of a few more global.sockets calls
psychobunny e658531a67 replies are up
psychobunny a7f4c16140 Merge branch 'master' of https://github.com/psychobunny/node-forum
Julian Lam 924618fc29 removed account_settings template
psychobunny 1f97fefac0 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 0f3f2bb859 post replies, unfinished
Julian Lam 62779ef0dd relative time on topics and posts
psychobunny f8345a1223 added timestamp to record users
psychobunny a655ebb290 most users ever online block
psychobunny bb8d5098e4 fixed bottom border on last topicrow
psychobunny 93d7f8d52c hide latest user block if doesn't exist
Julian Lam a6cbed94fc changing some niggling CSS to turn on bootstrap-responsive
Julian Lam cb9a110a5d RUN npm install AFTER PULLING THIS COMMIT!
Added user label to header, gravatar support
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 e5a6d1bf8b added a way to track socket listners added to the page to prevent memory leaks and duplicated definitions of events
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
psychobunny 7e637a93bb added login message + ajaxify.go to homepage (should add redirect code to originating page later)
Julian Lam f774974803 logout functionality
psychobunny a16f72e11c redis - added mget and multi, finished initial topics listview on home page, finished get topics method calls
psychobunny 877219cb58 fixed conflicts
psychobunny e50e136d83 inbetween some changes but asked to pull so I'll comment better later
Julian Lam 0985087f5d auth...
psychobunny d711a4e334 added post button, post window, added click handler to toaster alert, started on posts and topics schema and code
Julian Lam dfd5c9960b finished pw reset page, finally
Julian Lam 5792946a16 added DEL support to redis wrapper lib
Julian Lam 5369be0397 timing out reset codes, enhancing template replace so that a single placeholder can be used multiple times
Julian Lam dea9a707dc interim commit for password reset
Julian Lam edf698818d fixed baris' name in footer
psychobunny f8e1489de6 forgot to commit reset.tpl
psychobunny f911b8d1de added copyright info at footer, moved recent activity to global footer (from register)
psychobunny 8f7b295480 integrated dcp templates, changed reset email to use templates
Julian Lam 19f9a48a8c Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam e56e7b549b more stuff on pw reset
psychobunny a06b3519a1 moved event alert to serverside, now node controls the registration alert. added some transition animation to page changes
Julian Lam 9fcbca8da9 Merge branch 'master' of github.com:psychobunny/node-forum
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 96a4cbd8d1 fixed menu "active" state
Julian Lam 4edc1cd3ea added missing files
Julian Lam f975105176 added email to registration fields, email existence check
psychobunny 1d35f369d9 clean up client side + config.json
psychobunny 3d81f129e3 added login, fixed gitignore
Julian Lam 2cf0a9045a Merge branch 'master' of https://github.com/psychobunny/node-forum
Conflicts:
	src/webserver.js
Julian Lam a2d727dd86 setting up config file for use in app, updated readme
psychobunny ccc57b0d71 forgot to add redis.js
psychobunny b04d262fe4 init, just some testing