Commit Graph

1019 Commits (dbe0b1551beb043ee7125b7505faac8c2eefd18f)

Author SHA1 Message Date
Julian Lam 6a91c8a116 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 6f16088cd6 cleaning up readme file and fixing bugs in editing of posts ("asdf" anyone?)
psychobunny a08fbf4591 reduce avatar size in sidebar responsively
psychobunny 1d9dd604c0 prevent new topic button from overlapping in mobile
Julian Lam 812cdd28bf removing default client side config file
Julian Lam 89d484c4ca removing old post_window (!!) and fixing default focus when the composer is loaded
Julian Lam 82736d8780 editing of posts using new post window
Julian Lam 061c7a9e66 half broken editing
Julian Lam 2b4782b376 removing console log
Julian Lam 1ff77f853c Merge branch 'master' into post_window_refactor
Julian Lam 676ddcd3e3 integrating the new post window into the forum
psychobunny 5e289ac9b4 added back a slight border radius onto category listing on home page.
psychobunny 46fbf5e0bf removed placeholder in "recent" header for now
psychobunny a716de5029 moved category and topic into their own less files. removed .caret-left I don't believe its being used.
psychobunny e5b46dc4ed ...removed the wrong class
psychobunny daa944cd50 removed unused class and moved topic-details 1px lower to be inline with gravatar.
psychobunny d620c29aa9 added rss button to topics. redesigned how the topic main_post looks - buttons were previously not visible on mobile as well.
psychobunny d4e4d17c5c prevent ajaxify from working on links with "target" set. added rss button as well as social icons to category listing.
Julian Lam 446bd3a022 constructing posts window
Julian Lam 0a00eac970 added requirejs, new 'composer' module for all posting related functions (client-side)
composer module only has "push" at the moment... doesn't render a window quite yet.
Julian Lam 1aa4a440a0 motd tweaks in admin panel
Julian Lam 1760cf1e89 added motd to admin panel and added colour and transitions to alt-login icons
Julian Lam 9af39622ed actually using identicon default across the site
Julian Lam 3848115afe Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 68b7609ab6 identicon integration for twitter + fixing missing social icons for registration page
psychobunny d76432a20f console.log
Julian Lam fa15f2e4d5 tweak to less file
Julian Lam c63d6f75c2 updating social login icons to use font-awesome equivalents instead of (possibly) proprietary icons
psychobunny f05b5165c5 fix for footer js not executing on non-root
psychobunny 6dd8264685 updated to latest font-awesome (3.11)
psychobunny 8a939fa4cc removed left over template variable in category.js
psychobunny 34131ad46c modified exec_body_scripts to load external scripts. finally moved all the js files out of tpls into their own js
todo: still need to organize the individual scripts client side,
psychobunny 392883b911 bugfix: show post row for new topic on previously empty category
Julian Lam 92aaeca899 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 48bccb3498 applying custom theme (if enabled) to all routes
psychobunny 82e8b481b8 fixed posting bug and moved new topic button to be visible if no topics found
Julian Lam 7f77ec2c5f committing hotfix to registration
Julian Lam dec9a3bef9 adding missing admin css file, some other tweaks and cleanup
Julian Lam c1755d0dba theming 'try it' support for ACP
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 88bf9425db install script + patching up integration with install wizard
Julian Lam 5d7ec10aae Merge branch 'master' into install_script
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 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 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
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
Baris Usakli 16bf813dcd home page derp
psychobunny 0f51843213 if there are no topics in a category and you make the first topic it doesnt show up until you reload the page
Julian Lam cf64952918 bugfixing notif window
Julian Lam 7321088ac5 added a call to check for new notifications on load
Julian Lam 79bf5fad5b tweaks to notif window to show relative time
Julian Lam 1f7ab82f78 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	src/webserver.js
psychobunny cd4ca110a1 moved utils over to client side for code sharing
Baris Usakli 65e24ed5cb added admin routes to config.json
Julian Lam 78713f0599 Merge remote-tracking branch 'origin' into notifications
Baris Usakli f4218264e2 successful >:)
Julian Lam ffbafc99c4 Merge remote-tracking branch 'origin' into notifications
Conflicts:
	public/css/style.less
	public/src/app.js
	src/websockets.js
Julian Lam c8d48127ad more changes to notification dropdown in header bar
Baris Usakli 37985cc383 cant send empty chat messages anymore
Baris Usakli 9e54602d16 removed debug code
Baris Usakli 3c0b86689a if same id is used it replaces the current alerts contents
Baris Usakli 58d12c9c7c possible fix to post window opening on page load
Baris Usakli fe37dfecf7 connection/disconnection handling
Julian Lam 64f320743a renaming the notification window to 'alert_window'
Julian Lam 194793d14d Merge branch 'master' into notifications
Conflicts:
	src/websockets.js
Julian Lam 6f4c480cd8 interim commit on notifications dropdown
Baris Usakli ad1f688e85 chat text area is readonly now
Baris Usakli 45e92b0b8d when u drag a chat window it comes to front
Baris Usakli c7dcbb8ab2 added jquery.ui.min
Baris Usakli 6e8a18f475 fixed IE bug when chat message was sent post window was opening
Baris Usakli 8d0ac4cb07 chat feature
Baris Usakli 40b2aa2a80 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 9f8c9e8822 derp
psychobunny 17cde19020 potential fix for templates bug
Julian Lam 93f3a0e524 adding some default text to meta title and desc
Julian Lam 499f840e1e added toggle in config to switch on and off the motd
Julian Lam 16dac16d91 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ec463ce3d3 added motd support
Baris Soner Usakli ef304a712f strip tags from signature when they are saving, separated info in user profile and added signature box
Julian Lam 907f5d4ea6 hiding the thread rep count from the template because... we don't actually
actively have a plan for thread rep...
Julian Lam 624ccc592c resolving issue where the post window stays open during navigation
- app.close_post_window now neatly closes the post window
Julian Lam 74c13ba299 Merge remote-tracking branch 'origin'
Julian Lam fd38b60bd6 fixing issue with teasers showing deleted post info
psychobunny 34133eef8c post counts + read status working on homepage category listing. fixed posts.get_cid_by_pid
psychobunny effb26c856 user friendly message if no topics exist in a category
psychobunny ab492f147f check for online/offline users, added custom redis sismembers method, fix for category view not showing up if it has no topics
Baris Soner Usakli 03fcbcb051 add commas to rep when u post a new reply
Baris Soner Usakli 9c5fa5fc5e signature work
psychobunny 47d491b266 some left over unfinished templates fixes from last week. deeper urls now take higher precedence.
Julian Lam 94cd7e84eb updating bootstrap to official 2.3.2 version
Julian Lam e62fcc5831 refactored the entire privileges stack. .editable() is now deprecated, use
.privileges instead. Privileges now are inherited, so querying a topic's
privileges will automatically query it's parent category's privileges as
well, etc.
Julian Lam 3e8d664e71 fixing derpage on new topic posting... works better now
Julian Lam dd515ef831 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 7757c29889 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam fe9adf696d new post event (although there is a bug... hmhm)
psychobunny 19cfef9570 fixed /recent /popular /active /users/name
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;
Baris Usakli 19249cdd5b Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli c2c3ba0119 signature css, modify to your pleasure
Julian Lam bd99d1e379 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 24c6d2c458 manually applying fix as detailed in https://github.com/twitter/bootstrap/issues/7118
Baris Usakli 7dda970292 added signature to main_post template
Baris Usakli bece6a7878 added signature to topic template
Baris Usakli 1f5956d031 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli 994b7e8b33 signature
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
Baris Usakli d8489e2c66 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli dfdbc3bea2 admin/redis page
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
Baris Usakli 37b5680db0 fixed admin page loading
Baris Usakli aaae9e0c83 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Usakli f4acb493d0 removed commented out code
Julian Lam 1b63207920 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 4b6ad9607e removing static saving of recent post, and added in dynamic pulling on Topics.get
Baris Usakli 545dc9d851 top bar user settings are pulled right
Baris Usakli c8b8899219 while you are editing a post you still need to write something dude
Baris Usakli c2c4c003ab if the user updates their email change the email uid mapping, added 500ms delay to the disconnect modal
psychobunny 6492da0876 css some refactoring of topics and posts, made them properly responsive in general. added rep vote placeholders on category listing.
Baris Usakli 5c2efafa0b disconnect modal
Baris Usakli 0e39acb366 moved addCommas to app, using addCommas in topic.tpl
Julian Lam 122d43d37f Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 1b553fc9b4 adding alt text to right sidebar images in topic listing
Baris Usakli 15006c6988 fixed quoting
Baris Usakli aac8182a1d dont allow empty or short post title and body
psychobunny e583c5ffc2 console.log
Julian Lam e256ee99f7 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam bdeb7b13f1 interim commit for moderator support
psychobunny a663f4e835 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 88de8cd824 fixed an issue in bootstrap.js causing ctrl-click to not work. removed ctrl-click / middle click simulation code in ajaxify. am currently using unminified bootstrap TODO minifiy fixed version;
Baris Usakli 34432773d6 fix crash when you go to /topics/nonexistant
Baris Usakli 9d5f6364ad removed console.logs
Julian Lam 2e184c6211 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 6013017ffd fixing bug where the favourites star was still shaded in if an anon tried to favourite a post
psychobunny 77c96eb57d moved content in main_post over to a new line, looks better with inline images
Julian Lam 826edbd669 added linking to formatting opts in editor
Julian Lam dcbc93cacf fixing up formatting bar to not be highlightable (and not have an outline
when the span is focused on), also tweaked the formatting options to
behave a little more smartly when text is currently highlighted when it is
invoked.
psychobunny e1a83099e8 fixed bottom padding on mainposter avatar
psychobunny 9977a44099 removed the img-polaroid class from main-poster and replaced the stats with a hover over for desktop. tbd duhsign for mobile
Julian Lam 3627b1790f Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 5e9340a4fe fixing ajaxify bug where external links (and the logout link!) did not
work -- basically any link that wasn't a template didn't work
psychobunny 725d4c09fa Merge branch 'master' of https://github.com/psychobunny/NodeBB
Conflicts:
	src/posts.js
psychobunny 435d24eb25 differentiation between the main post and rplies including preliminary duhsign
Baris Usakli 9cd189e273 relative time fix
psychobunny 91b4ec2547 fixed crashing error in graph/user/picture, and started updating the main post row in topic.tpl
psychobunny 74649f64e2 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 25e218442a updated category: tracking active participants + removed placeholder; recent author picture now pulled dynamically; graph/users/picture implemented
Baris Usakli b949105142 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Usakli ecc621e0c1 disconnect event
Julian Lam e31f6af774 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam b0cf97c5d6 editing features, part 1
Baris Usakli 09c80b8289 fixed unfollow button
Baris Usakli 3b0978caa7 add friend button invisible if user is already friend
Baris Usakli 58aa0ee647 friends
Julian Lam 6c82ffa09a fixed bug where middle-click didn't work on firefox. Now ajaxify is capturing both onclick and mouseup
Julian Lam 1d78c6a35d removing debug statements from ajaxify
building in middle click and ctrl-click listeners for new tab opening
instructing git to ignore everything in the /uploads folder
Baris Usakli 39798b9f79 changed the file upload to use streams
Julian Lam f767d3a007 making the toaster notifications have fixed positioning instead of abba-solute
Julian Lam e4364b5362 pushing fix to ajaxify where the homepage did not get added to the history (and thus was unreachable via history action
Julian Lam 98193ecb29 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 3eff46bb52 restricting posting by anons, redirects to login page and saves post to localstorage
psychobunny f608505cbb Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny a7cefe35f8 started to add real data to the topics listing, got latest post working per topic
Baris Usakli 233752a9c7 why does urls dont work when put into address bar
Baris Usakli b0284487f2 added users link to top bar
Baris Usakli b13b74dadb buttons for add friend and send message
psychobunny 527547b4a4 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 35974ed6b9 more changes to category view
Baris Usakli 073b87982b moved user routes into routers/user.js
psychobunny 3fa0f7c8b5 fixed three bugs in templates: 1) if you're sending in null as a value it should now correctly replace that field as ''. 2) you don't need to put objects last in data anymore (stupid bug) 3) you can now send multiple objects to be parsed in templates properly; Also added deprecation message to server side templates
psychobunny 8e48990a48 Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 7e67260a74 still derping away on duhsign
Baris Usakli 188b1d5ada for andrew
Julian Lam 613b53ac3d removing console logs
Julian Lam 315cf9a88d Merge branch 'popstate'
Julian Lam c351d83418 added popstate functionality
Baris Usakli d564811b71 fixed the data passing to accountedit.tpl
Baris Soner Usakli 901b378912 css fix
Julian Lam 23254103e4 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam f662353cbf fixes to thread avatar on phone
Baris Soner Usakli d7b6141e31 button to change picture
Julian Lam 487d740164 added client and server validation on registration
Julian Lam 8bb724e994 minor tweaks to config default, and text copy update on registration page
updated readme to mention the upload_path option
psychobunny 49fcea503e Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny e41cc6fd10 toying around with category listing again
Baris Soner Usakli 613325c4ec Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli b18330f246 fixed bug in image upload that was causing multiple form submits, added progress bar to image upload
Julian Lam aab149aecf Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 80b20fe877 adding alternate logins to register page
Baris Soner Usakli 3b6e20d4ef image upload cleaned up a bit
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
Julian Lam 9df65da7d4 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 0c047d2fc4 fixing indents in one code block
Julian Lam 1b61511e8a fixed tabindex in reply window, wrapping up some minor bugs in editing
posts
Julian Lam 156d5dce08 post deletion
Julian Lam 4fd1244e2d some work on deleting posts, and allowing a mod to edit a post
Baris Soner Usakli 9ba5490da6 users page images 80x80
Baris Soner Usakli 6d0ac161bc Merge branch 'master' of https://github.com/psychobunny/NodeBB
Baris Soner Usakli 0c885dc11e fail folder
Julian Lam 8550858394 Merge branch 'master' of github.com:psychobunny/NodeBB
Julian Lam 2625f52c86 fixing the 'motd' hero unit links
Baris Soner Usakli 0aeeac9d61 image upload and changing images will clean up later andrew stayla
Baris Usakli be072dbd68 added click listener to delete post
Julian Lam b244da724e edit labels, and fixing responsive layout in topic view
psychobunny d98a1473ee Merge branch 'master' of https://github.com/psychobunny/NodeBB
psychobunny 42b4f90fed bad commit earlier, lost the footer. just reduced delay to 200ms now and it looks much better
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
psychobunny 88f64b4a79 optimized the transition between pages just a bit
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 d77ab9048d removed logs
psychobunny 09c9d0ee1f fixed topics bug that was prevent /latest /popular /active and subsequently the admin versions of those routes from working. removed debug statements. added admin socket room. added dynamic updating of active users on acp index
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.
Julian Lam 3709150911 Merge branch 'master' of github.com:psychobunny/node-forum
Julian Lam 2acd40a8bb fixing up the post window to extend the body when opened, so it doesn't clip stuff
Baris Usakli 5057af7bbe user edit fix for !==
Julian Lam 2ca1986b40 moving threads will refresh view for all connected clients as well
Julian Lam a0fa95b9f0 Merge branch 'master' of github.com:psychobunny/node-forum
Baris Usakli 9166a9ccde user edit changes
Julian Lam 917eadae95 Merge remote-tracking branch 'origin'
Baris Usakli 67191b3a54 Merge branch 'master' of https://github.com/psychobunny/NodeBB
Julian Lam ff025f0e48 interim commit to thread moving
Baris Usakli 5edf7efd8f user edit and profile changes
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
psychobunny baecab84de added code to remove fields that are not passed in for templates
Baris Usakli 187d5a101a edit page
psychobunny 31e845f4b0 added regex matching to templates/ajaxify. needs cleanup, just unblocking baris
Baris Usakli 36e7baa84d userS
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
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