Commit Graph

8909 Commits (e963715e945d9099e86ee52e1f6b58bc40a3ccf9)

Author SHA1 Message Date
psychobunny 4cb59c5aa9 started styling category.tpl, and added a fail plus sign to header, will revisit in the AM
Baris Soner Usakli a80e9c3cdd users page change
Baris Soner Usakli 3f67fc29e8 links from user pics in posts
Baris Soner Usakli 8710aa3457 users page
Baris Soner Usakli 781c99295c fix so templates load when custom_tpl is 'undefined'
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 0499343940 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli 781d7cf9cf template stuff
psychobunny cdceb39828 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 6cb739ee67 install scripts for categories and added new post badges to category listing
Baris Usakli fa04273b72 footer lastest user links to their profile
psychobunny 3e30f6ac5a Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny b734ee5c50 homepage complete, hero unit et al.
Baris Usakli bf731dc224 user edit
Baris Usakli d2f830c75f fixed active users and reply user links to use /users/username
Baris Usakli cef1ba4c08 changed profile page to /users/username
Baris Usakli 0eacec8166 Merge branch 'master' of https://github.com/psychobunny/NodeBB
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 96b9d41698 removed return to home link from topic, realized that breadcrumbs are right on top
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
Julian Lam ae43a299df hiding edit and delete buttons from indiv. posts if thread is locked
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 2ce70dbb93 restricting upvoting if a thread is locked
Julian Lam 43a76f9c9c fixing socket returns to emit to everybody in the room (on thread locking/deletion)
Julian Lam 7ed2413d96 Merge remote-tracking branch 'origin' into thread_options
added some styling and elements to thread deletion

Conflicts:
	public/src/ajaxify.js
psychobunny 4b32089367 temporary fix for templates loading twice
psychobunny 6ebc5398a7 fixed custom_mapping bug
Baris Usakli 9ad1b572aa what i have
Julian Lam 7bbc630dfb Merge remote-tracking branch 'origin' into thread_options
Conflicts:
	public/src/templates.js
Julian Lam 250c70bdfc topic locking and deletion
Baris Usakli 85acabf1f6 Merge branch 'master' of https://github.com/psychobunny/node-forum
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 4ffbf88274 fixed header to link to new users page
Baris Usakli ec104b05d4 added links to user profiles from posts and the breadcrumbs
psychobunny 1df9de049b forgot templates config
psychobunny 5153aa7652 added template mapping, did users->account
psychobunny c80d178a57 duhsign for category home page
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
Baris Soner Usakli e57ae200e4 account page border
Julian Lam 35770edcae added thread tools dropdown
Julian Lam f0f1ed7ed8 added lock icon to locked button in threads
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 6e49dc65c7 css
Baris Soner Usakli 91c2271ffd account page
Baris Soner Usakli 48d5100dfe some profile changes, added post count to users and account and some css to account
psychobunny ecf3ffa170 fixed anon bug in users browsing this thread code, simplified the logic as well, fixed language
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 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 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
psychobunny 8133ac53de small change to ajaxify to ignore href='#', added some design to future features, up for grabs if anybody wants to do them
psychobunny b47f292eaa Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 496ed20615 fixed annoying footer being hidden then reshown on first load
Julian Lam 1fc6e0db2c added email verification on registration
added email header and footer
Julian Lam 1afc575bc9 Merge remote-tracking branch 'origin'
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
Julian Lam 458cd31b4b adding account to the template index
psychobunny 93c5931bb0 fixed listener memleak causing new posts to appear duplicated
psychobunny 5aa3dab289 added popstate check to trigger ajaxify on back button keypress. forward button doesn't work yet
psychobunny dd4758725e fixed bug where events weren't being attached to new posts being parsed in
psychobunny f0bb70fa3a adjusting rep of a user now affects all instances of that user on the page
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
Julian Lam c5cf128629 Merge branch 'master' of github.com:psychobunny/node-forum
psychobunny ebaa69d987 responsive threads - although avatar is *slightly* misaligned on my phone. not sure why
Julian Lam 0dbc1ba692 restricted the user.get socket listener to only react once
psychobunny b7782dbf7f clean up
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 9fb2a338bb whitespace probably oops
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 c73d1237d2 started favourites/rep
psychobunny 2b50c43a5f Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 7db1834182 gravatars in posts
Julian Lam 430e65a352 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam ba1001aac9 fixed alternative login css
psychobunny 2bc9876852 fixed ready_callback bug
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 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 abf4be488a Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 9fe73d68fc style changes to topics
Julian Lam 00f7347575 css cleanup
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 4c41011d83 minor stylistic change to header
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 417e722ae7 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 60c1e937a1 tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server
Baris Soner Usakli 06d013e6de Merge branch 'master' of https://github.com/psychobunny/node-forum
Baris Soner Usakli a47491225a clear topic and content after post
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 3ef6cf6cb2 updaring config template
psychobunny 279a0053f1 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny f68d9c6635 forgot to update config, derp
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 ab456e07af fixes to template parser: hide block if no data exists (prevents the default tpl skeleton from showing up)
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
Baris Soner Usakli 20aa5d439e log server errors in browser
added uid to posts
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 faa3924734 prevent scripts in tpls from being executed more than once
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 a98cd26fa6 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 0985087f5d auth...
psychobunny 78d753b8f9 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny fffe5eb78c tried to get innerHTML of an input by accident
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
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 9a009618d5 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny 8f7b295480 integrated dcp templates, changed reset email to use templates
Julian Lam 8e49e0f203 fixing event propagation in ajaxify.go
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 3c04a71b08 renaming functions so that they're less derpy (from enable/enableAll to
enable/onclick)
Julian Lam 2b4e562e21 committed fix to ajaxify that caused any newly appended anchors to not be
ajaxified, also tweaked ajaxify so that it only unbinds its own events
instead of clobbering any other events attached to anchors (#futureproof)
Julian Lam 4edc1cd3ea added missing files
psychobunny fd9cb2eaf7 ajaxify.go(relative_url); - use this to navigate to a page manually
Julian Lam f975105176 added email to registration fields, email existence check
psychobunny db8140a1b6 Merge branch 'master' of https://github.com/psychobunny/node-forum
psychobunny be954d176d prevent same state from loading again
Julian Lam 2d8725d522 changing socket.io to exist on the same port as the server, made config file template (removed config file from repo)
psychobunny 5b64500da3 switch loading of config file to synchronous to prevent socket server from opening pre-emptively
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 f7690896cc cleanu
p
psychobunny b04d262fe4 init, just some testing