hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,817 Commits
2 Branches
0 Tags
158 MiB
Commit Graph

7304 Commits (041167decfdb9764b6b87ab14f79fdd0a0f32769)

Author SHA1 Message Date
psychobunny 8e1ee88878 removed derpy + from header ill come back to that later when im more inspired... fixed ajaxify for custom routed urls, fixed recent/popular/active tab's invalid object initializer
Baris Usakli 187d5a101a edit page
Baris Usakli 36e7baa84d userS
Baris Usakli 5e36ca2fbe removed dupe function
Baris Usakli b2adda06c8 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli d308242d2d decimal places for rep and post count
Julian Lam 4dced643c5 tweaking app.alert so that on regular fadeout (after timeout expiry), the alert is removed from the DOM
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
Baris Usakli 8fe4905b68 exists function fix
Julian Lam b57109f6fd floating pinned articles to the top of the topic list
Julian Lam 387419ef64 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam f0eeec8932 fixing alert removal by alert_id and adding alerts when thread is locked or pinned
psychobunny 91d9775cc4 fixed slugs from disappearing if f5ing
Julian Lam 8bccc8466e Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bf7c602cd8 thread pinning
psychobunny 2dccfb96e7 Merge branch 'master' of https://github.com/psychobunny/NodeBB 
Conflicts:
	src/posts.js
	src/topics.js
psychobunny ae2be687b8 small refactor plus breadcrumbs for all ur pages
Baris Usakli 283dbc477b Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 6a6eeae426 edit changes
Julian Lam d35bffa830 removing topic from listing if deleted, and adding lock icon if thread is locked
Julian Lam a3e816b68e Merge remote-tracking branch 'origin' into thread_options
Julian Lam 43a76f9c9c fixing socket returns to emit to everybody in the room (on thread locking/deletion)
psychobunny 9e23279459 fixed socket notifications for new posts
Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options 
Conflicts:
	public/src/templates.js
Julian Lam 250c70bdfc topic locking and deletion
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 ccf0f6dd73 removed get_username_by_uid, use getUserField(uid,'username',callback) directly
Baris Usakli 49cb5fddcd removed some console.log
psychobunny c80d178a57 duhsign for category home page
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 97c1819dc4 forgot to commit category files
psychobunny fa64e84dcc fixed a bug in templates, introduced categories, added default setup script onload, moved home.tpl code over to category, created hierachies
psychobunny 178bc82a55 removed deprecated functions from topics.js (server side parsing) and fixed the 150ms initial delay on first load
psychobunny 724c1511af moved slugify to utils
psychobunny 4c524922cc posts.get().unfactored().refactored().commited().pushed(); if (conflicts) throw new Error ('IGNORED'); yep.
Julian Lam 86af1b2af5 topic creation now checks for valid pid as well
Julian Lam 4f38bb10e8 Merge remote-tracking branch 'origin'
Julian Lam 6b9b72a550 restricting post replies if a thread is locked (returns pid of -1 instead)
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 922acc0f79 added locked state to Posts.get
Baris Soner Usakli 9a3c907056 set post rep to 0 when created
Baris Soner Usakli 48d5100dfe some profile changes, added post count to users and account and some css to account
psychobunny 92175274b5 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny ecf3ffa170 fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language
Baris Soner Usakli 57354fe582 changed posts.reply to use the getUserFields method and removed the 2 old methods from user.js
Baris Soner Usakli 47782df9cb Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli 883f029a3a agian
Julian Lam 4a1dc28a26 *shenans* refactored Posts.get to use async module instead of callback 
pyramid. Call time net decrease = 0, rofl.
Julian Lam 30bf27f1c7 Merge remote-tracking branch 'origin' into posts-refactor
Julian Lam 08c303b3c7 interim commit
psychobunny 1009726b51 almost done X users browsing this thread feature. there is one bug where anonymous users do not get disconnected from the room, so I'll have to figure that out later
psychobunny d6bd801561 Merge branch 'master' of https://github.com/psychobunny/NodeBB
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 9b5c8de541 setUserField
Baris Soner Usakli c906b7419a added reputation to /account
Baris Soner Usakli 3bdbf3c191 password reset will use the user has
Baris Soner Usakli 54b4c55dfc removed the unused login function
Baris Soner Usakli fee76db8dc more fixes
Baris Soner Usakli 954392e4c4 fixes to gravatars and get functions in user.js
Baris Soner Usakli 8a0266562c Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli 08f7b64ccf hash changes to user data
psychobunny 26c22b0559 bugfixes + starting active users in thread feature
psychobunny 3947b6b6fd modified ajaxify slightly to make transitions between pages a bit more fluid (although first load doesn't look that awesome); fixed up rooms - resolved DRY failure and properly leave rooms
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 35f2ac7bf7 small style changes in header, added edit and delete button for moderators/own posts, hide moderator tools for all users except those that qualify
psychobunny 4807002447 fix for responsive avatar, fix for submit/discard buttons taking you away from the thread
psychobunny 6142225726 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 69565b0ded fixed a bug where anonymous users couldnt access topics
Julian Lam 73fc0a3699 customising markdown parser to allow single line breaks
psychobunny ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
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
psychobunny 5e48b4cdc5 redis updates for sets: added sadd, srem, and sismember; finished basic favouriting/up/down votes - still need to add socket support in future
psychobunny b5622690e0 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny c73d1237d2 started favourites/rep
Baris Usakli 2a3ef2408f fixed post content
psychobunny 2b50c43a5f Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 7db1834182 gravatars in posts
Baris Usakli 3c86b43ba3 post count is incrementing when replying
Julian Lam 430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bceaf67c20 INSTALL build-essential AND RUN npm install!!!! 
bcrypt integration
psychobunny d622c9e100 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny edf58693cc added real username to posts
Baris Usakli 7dc9fd83c1 account page shows up when logged in and 403 when logged out
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
Julian Lam 6d36df1604 tweaking users/* calls
Julian Lam 0ae4e31163 RUN "npm install" AFTER THIS GIT PULL!! 
Integrated markdown parsing to all post content. Title content by default
not going to be parsed, using default options unless circumstances dictate
otherwise.
Baris Usakli 7f12d568ff user name on home.tpl
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
Baris Usakli 44485a2e40 fixed session ids
Julian Lam bef0bd87da Merge branch 'master' of github.com:psychobunny/node-forum
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
Baris Usakli 8cedb33c82 Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Usakli 39b24436d0 removed global.socket, passing in socket to the functions now
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 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 6471109a25 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny e658531a67 replies are up
Julian Lam 70d3105a8e configuring express session to use a secret defined in the config file, 
not a hard coded one
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 b762ec275e Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny ab456e07af fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up)
Julian Lam b93c003251 Merge branch 'master' of github.com:psychobunny/node-forum
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
psychobunny a655ebb290 most users ever online block
Baris Soner Usakli 20aa5d439e log server errors in browser 
added uid to posts
Julian Lam cb9a110a5d RUN npm install AFTER PULLING THIS COMMIT! 
Added user label to header, gravatar support
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 19a63bf51b fix for threads that have 0 posts
psychobunny 1037088643 commented out breaking code regarding user var
psychobunny 303452ef8c fixed conflicts
psychobunny 126f817f7d updates to posts
Julian Lam 64ca3d7444 properly broadcasting a user.active change
Julian Lam 7827534819 tweaking active.register so that it emits an active user change
Julian Lam 570dfd9786 updated topics module to use uid as a passed in param, instead of through global.uid
Julian Lam 33f155b2d1 updating web sockets so that uid is populated for socket calls
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
psychobunny 7e637a93bb added login message + ajaxify.go to homepage (should add redirect code to originating page later)
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
psychobunny e50e136d83 inbetween some changes but asked to pull so I'll comment better later
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 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
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
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 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 efa0649081 moved RedisDB.js to src/redis.js
psychobunny 9b973327a0 registration bugfix
psychobunny b04d262fe4 init, just some testing