Commit Graph

2212 Commits (86556989f404a5ddf0880fae2bc7eb499c781e47)

Author SHA1 Message Date
Julian Lam 95d671281a moved port 80 and 443 warnings to its own conditional
Julian Lam 38ee3fd5a3 don't bother firing hooks received by js unless a listener exists
Baris Soner Usakli 38886f6b58 making a socket call will set lastonline
Baris Soner Usakli ed401de169 closes
Baris Soner Usakli f68b692ce4 closes
Julian Lam 50c4a707e5 removing empty login.js
Julian Lam 744b6517bf issue
Julian Lam db62e10673 upgrade scripts for sso plugins
Julian Lam fac55160fa new translation strings for pages, proper unicode handling in parseFragment
Julian Lam e69f5fff3b added "pages" translation file to languages
Julian Lam 5482146bc4 simplified a conditional
Julian Lam 6514504ddd fixed
Julian Lam 8e1137b5dd Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ef39c128c2 Removing Google Plus integration from core - adios!
Baris Soner Usakli c18788fbc9 crash fix if topic has no posts, and check confirm obj
Baris Soner Usakli 8e4236a3a9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli e4d60b7a55 Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master
psychobunny f8be072b99 chats - isNew flag, and sending in userData.uid now
Baris Soner Usakli d54e2fba9e closes
Baris Soner Usakli fb8fbb2372 removed console.log
Julian Lam 7e3c46db61 Removing Twitter SSO - toodles!
Julian Lam e7eab83d8f removing facebook SSO from core
Baris Soner Usakli 25c4648e2e load 20 in recent
Baris Soner Usakli 8770284661 removed console.log
Baris Soner Usakli 8d0b880e5a Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 25442a89ca closes
psychobunny 6ab08e91a2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny 45a5b88824 added filter:messaging.parse hook
Baris Soner Usakli fac2cd9464 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli da626a4035 more fixes
Julian Lam 0c71707fb5 fixed
Julian Lam 0869765e2b Merge remote-tracking branch 'origin/master'
Julian Lam 22354227be hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool
Julian Lam 96b2a15290 user registration now no longer sends a welcome email if no emailers are present
Julian Lam d7d4290099 resolved
Baris Soner Usakli bd0b5f4cdb more error checks in thread move
Baris Soner Usakli 2988230b07 some more fixes, cant quote and see deleted messages
Baris Soner Usakli 1afd7ae332 trim pagination numberS
Baris Soner Usakli 6628db89af added saerch array
Baris Soner Usakli b4ea8e58fa removed check for no topics in category, you should be able to go into empty categories
Baris Soner Usakli 6ff11c5243 check for number
Baris Soner Usakli 75f178636b more fixes
Baris Soner Usakli 1084523c92 lots of pagination work, query params, ajaxify to pids
MrWaffle 869f9e0d86 Add custom templates to /api/get_templates_listing
Baris Soner Usakli 8744013013 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli 2e786cc4d1 closes , removed global translator, templates and server objects
Baris Soner Usakli 393bb7245c closes
Baris Soner Usakli d718eca935 fixes global meta leak, and categories meta require,
psychobunny 46e29dfb2b Merge branch 'master' of https://github.com/designcreateplay/NodeBB
psychobunny d67ae5c2be changing undetected minified JS file warning to info message instead
Baris Soner Usakli b23960e8d7 fixes to category pagination
Baris Soner Usakli ef6fd35e85 lots of cleanup, moved pagination to requirejs module
Baris Soner Usakli 0580d0c8a3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli 606367701f pagination on posts
Julian Lam d5534cf545 fixing upgrade script on edge builds
Baris Soner Usakli 8d007e7029 Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
Baris Soner Usakli cf39c66017 some pagination work
Julian Lam a3fe390810 reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!
Baris Soner Usakli 620ff65cbe Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 7f23f848fe fix for mismatch between favourite count and number of people in favourited seT
Julian Lam 459d5ddccd fixed - added proper detection so that onpopstate would not react if it was a proper page load
Julian Lam 43808c01ec reduced the number of 'ajaxify.go' calls to one, in /src
Julian Lam b587d7b5ad fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.
Julian Lam dc7cd95f6d Merge branch 'master' of github.com:designcreateplay/NodeBB
Baris Soner Usakli f3bdc55348 little tweak to user search show timing and 10 users, sort after slicing
akhoury dcc6ec797e removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820
Baris Soner Usakli b0ef974590 lots of cleanup and refactor
Baris Soner Usakli f62c82c797 send app to action:app.load
Baris Soner Usakli bc1cde38da added getObjectKeys for julian :)
Julian Lam 2af14e47b1 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam d380f69310 support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden
Baris Soner Usakli 824c5072e8 topics should be marked read correctly if you are already in it
Julian Lam f02cd9df82 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
	src/user.js
Aziz Khoury 659817b4f1 Update comment
Aziz Khoury 7e3d8d65f5 Update login.js
Baris Soner Usakli b717c74a81 closes
Baris Soner Usakli 042174290f removed console.log
Baris Soner Usakli b325212182 crash fix for admin verify email, temp fix
Baris Soner Usakli 79803d2b3d Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy
MrWaffle d63ced8a5c Move to client side
MrWaffle 03d92eb5cd Thought I'd refactor this for you guys
MrWaffle da317b5a85 async wooo
MrWaffle c0e2e9d011 Remove log
MrWaffle 69b54337bb Limit to 5 users
Baris Soner Usakli b945dfc71d closes
MrWaffle b887b76c29 Implement favourite tooltip to show who favourited a post
Baris Soner Usakli baa74958c5 can set image class for categories
Barış Soner Uşaklı c709fae251 Merge pull request from BitBangersCode/admin-group-fix
Admin group fix
Richie Preece d959aad41f Changed to bcrypt.js
Baris Soner Usakli 18075b85c7 winston.error
Baris Soner Usakli e997c63480 return error
psychobunny 3b4f0a8f4e updating motd for incoming theme
Julian Lam 53a1474785 second pass for , blocked for now
Julian Lam bafc8caaf5 first pass at
Josh Rickers 55b0270b34 Merge branch 'master' into admin-group-fix
Josh Rickers bac1a5ec3e updated groups to stop you from removing yourself from the admin group
Julian Lam 397861c3cc Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 0020f278a5 stopped using unnecessary regex in user search
Baris Soner Usakli aa2978976c notif fix
Baris Soner Usakli a1149b8f8d notif unread class
Baris Soner Usakli 039f02456d if user is in the topic when a new post comes in mark the topic read
Baris Soner Usakli 9400e5bcc9 motd
Baris Soner Usakli f282dcd677 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 55d4a5fe3a template fixes closes
Julian Lam affa51856b closed pending explanation
Aziz Khoury da647d105b removing couple of console.log
Aziz Khoury 74f23497dc password should be passed to action hook, and it was being ovewritten
Aziz Khoury a13c321de8 added "trust proxy" config option with default to true
Aziz Khoury ba85ffb292 Merge remote-tracking branch 'upstream/master'
Baris Soner Usakli 71888adb09 closes , closes
Aziz Khoury f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well
Julian Lam e2960e3ed6 Merge pull request from BitBangersCode/mongo-fix
Add callback to mongo.searchRemove, fixes infinite schema update
MrWaffle e4d8ddcf1b Add callback to mongo.removeSearch, fixes infinite schema update
Julian Lam e1a9fe9691 Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
	src/webserver.js
Julian Lam 938b78786e closed - case insensitive user search
Baris Soner Usakli 5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 84aa1ab527 motd string and class
Julian Lam ee6ac77f8b new upgrade directive
Julian Lam b6aa31b245 removed references to Reds user search
Julian Lam e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
Julian Lam 483ad87c1d first pass
Julian Lam cfe46f38ee Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 0c0ae6560a re: -- removed upgrade directives for v0.2.x branch, and added minSchemaDate check so that if you try to upgrade without doing all upgrades in a previous branch, it will abort.
Baris Soner Usakli c9f43a60b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 3d30c0bd87 tmp fix for nested if
Julian Lam 3624717d84 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 07b286650c adding cache buster to ACP, removing bootstrap css in ACP
Baris Soner Usakli 4273fc4d23 added check for valid field
Baris Soner Usakli 7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 189e69284e fixes for post privileges
Julian Lam e8d6df22cb Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 5861630dec - removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
Baris Soner Usakli 1980e945da fixed admin page active sockets
Baris Soner Usakli 16a42619b5 closes
Baris Soner Usakli bbac361670 fixed crash if empty topic was loaded without ajaxify
Baris Soner Usakli 84cbcc5a97 closes
psychobunny 025e1293fa removed deprecated cssSrc, replaced with optional bootswatchCSS
Baris Soner Usakli 959e6e83ea closes
MrWaffle 5ed77b032e Fix plugin CSS files on Windows
Baris Soner Usakli dc27638ca8 sitemap fix
Baris Soner Usakli c00bd0b8d0 oops fixed
Baris Soner Usakli 22e1b0f22e check result for null
Baris Soner Usakli e6a9f5a704 error check
Baris Soner Usakli fd92d7b02a can mark topic unread for all
Baris Soner Usakli 00c6fc17ac removed console.log
Baris Soner Usakli 24ceb0f083 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 48eb6a3f22 composer changeS
Julian Lam 917dfe74e6 removing console log and removing a bit of code that would cause infinite loader to take 2.5s extra each round :P
Julian Lam d8c4609ee0 fixed - Once you hit the end, infinite loader will stop for good. If infinite loader is active when the browser hits the bottom, updateHeader will not assume 100%.
Julian Lam 962955f06a fixed bug with search (getTopicsByTids became error-first)
Baris Soner Usakli e884ff1f59 modules fixes
Baris Soner Usakli a34775a6c2 meta fixes
Baris Soner Usakli c0712583f2 fixed category sockets
Baris Soner Usakli d72926a5bb Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli a802dc4b68 admin.js socket fixes
Julian Lam af6eb5359e Merge branch 'master' into socketAL-fix
Conflicts:
	public/language/cs/global.json
	public/language/fr/global.json
	src/routes/api.js
Julian Lam 727ad4b651 added cache buster to nodebb.min.js even if it has not changed
Julian Lam 5e695d3222 fixed incorrect language string used in fb button in default motd
Julian Lam 45ce0566e7 added translation to default MOTD
Julian Lam 14b31cf4c8 hiding fork button on xs/sm devices (default motd)
Julian Lam beec96416f added translation to default MOTD
Julian Lam 253913f8d9 hiding fork button on xs/sm devices (default motd)
Baris Soner Usakli cfaa6556d6 pass err
Baris Soner Usakli b062af2c4b fixed user pwd reset
Baris Soner Usakli b3816b98a1 more post fixes
Baris Soner Usakli 31d353ab0e more fixes
Baris Soner Usakli 8740cc0fc7 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli ae76bb3928 lots of err first fixeS
Julian Lam 111776d878 notifications socket callbacks
Julian Lam e95da77fe8 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
Julian Lam bc48ba874d fixed module.js callback format
Baris Soner Usakli ced37044ca Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli 426d3e871f more fixes
Julian Lam cbb630fd6b fixed categories.js socket callbacks
Julian Lam 8041bee9fd Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli 6da6baa213 more crash fixes to socketS
Baris Soner Usakli ba8e98520c added data checks to user calls
Baris Soner Usakli 4366c11ec0 users.js fix
Baris Soner Usakli 39b631a3a8 more fixes
Baris Soner Usakli e061978bd5 more fixes
Baris Soner Usakli 2515ba9455 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli afe97233aa more fixes
Julian Lam 8b1ed1297b linting
Julian Lam 765402a2a0 fixed ACP online count
Baris Soner Usakli e5c8caf5ff more fixes
Baris Soner Usakli 1ec21c2bfd metatitle
Baris Soner Usakli 7470c1bbd9 more fixes
Baris Soner Usakli 2893693d17 Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
Baris Soner Usakli 0b132cadcf user fixes
Julian Lam 3177fdfa74 partially fixed acp active users
Julian Lam 08f97efcd4 Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
Julian Lam 71f1f7137a fixes
Baris Soner Usakli 220b40ff9c topics.js
Julian Lam 97eff9c8a1 fixing index call and meta.js
Baris Soner Usakli adf4a5c407 user.js changes
Julian Lam 42d6880ac4 migrating posts to new socketAL format
Julian Lam 35aa06c230 migrating notifications to new socketAL format
Julian Lam be3284e05e migrating modules.js to new socketAL style
Baris Soner Usakli 8bb24fa034 fixed update header
Julian Lam 2235dbd2a0 migrating meta.js to new socketAL format
Baris Soner Usakli f6bd52014e fixed conflict
Baris Soner Usakli accde93fff removed api: from server
Julian Lam 69a9570186 migrated catefories.js to new socketAL format
Julian Lam c215e61541 fixed up admin.js
Julian Lam 4184574164 WIP admin.js socket underping
Baris Soner Usakli d234dbdca2 first set of changes
Julian Lam a48a7acd51 fixing issue where after a user changed their username, the new name was not reindexed by Reds
Baris Soner Usakli 16aeb2d09d added fb to motd default
Baris Soner Usakli e16c3f3f80 added try catch to socket calls
MrWaffle b78dc3eca8 Chat now supports markdown
Baris Soner Usakli cd4cb240c8 upload file icon in composer was visible even when uploads were disabled
Julian Lam 7de540dc74 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam b3f23d41d3 fixed
Baris Soner Usakli 466c02a886 removed teaser_text
Baris Soner Usakli 265d1f6331 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli dcf47f558e limit search in db
Julian Lam facacc65aa Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 442c543d27 fixed
psychobunny 8c5a458798 fixed 403 redirect from logged out /admin
psychobunny 98d42b0ade moving social sharing parsing code from server side to client side & cleaned up templates
Baris Soner Usakli 75850bd315 closes
Julian Lam c8a514aa37 updated new timeago path
Julian Lam bc407ee59c fixing topic moving
Julian Lam a32aee60c2 reversing accidentally committed code to socket.io/index
Julian Lam 0266c5516c Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 32470efb22 fixing upgrade script console.log and missing sessionData for topic moving
Baris Soner Usakli bbcc2312db better redis info parser from node-redis
Baris Soner Usakli 07085f1ff2 fixed sockettopics.post
Baris Soner Usakli 0198024db0 parseInt uid
Baris Soner Usakli bc835f59d4 mongo getListRange fix
Baris Soner Usakli a97ee201d8 makes recent unread and category pages a lot faster, added logging when a user changes their username
Baris Soner Usakli c07bf466b2 added back search limiting
Baris Soner Usakli 3475ed59c8 removed reds from install.js
Baris Soner Usakli 93292e701d added error check to setOnEmpty
Julian Lam 97cc6cde67 closed - after upgrade script, all users will be in a system "registered users" group
Julian Lam 619fe74fc0 moved groups admin socket calls into admin file instead of standalone groups file
Julian Lam 4453d055ea linted socket/admin.js
Julian Lam aa689a7a29 fixed active users socket calls in ACP
Julian Lam 3fb44d7693 who needs recursion, bitch?
- enhanced socket abs layer so that a method call of infinite depth is supported (theoretically).
Julian Lam 5db9ff11d5 linting and adding missing require'd dep
Julian Lam e36f92b18e closed
Julian Lam 8d71098a0f fixed detection for admin client-side scripts
Julian Lam 3da96faa12 fixed email exists error... weird.
Julian Lam 98e4257939 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam eb974ec1d8 fixing user register socket calls
Baris Soner Usakli 30ad852492 closes
Baris Soner Usakli 8bc0096b00 dont closed composer if callback isn't called
Baris Soner Usakli f73c81d6c3 closes
Julian Lam ee963e0c2a moved reconnected socket call to SocketsMeta
Julian Lam 73cbde4098 removed websockets.js wooo
Julian Lam a150691b5e that's the last of it!! :D
Julian Lam a2329980c8 Merge remote-tracking branch 'origin/master' into socketAL
Julian Lam ea8aa3fff2 admin stuff, removed deprecated install templates, blah blah
Julian Lam c5d8a5a6b2 thread tools (phew!) -- sessionData is getting larger :P
psychobunny ef01717562 allow themes to set path to a frameworkCSS so you can include a customized BS or another framework altogether
Julian Lam 8dd8412ae3 so far so good... user, meta, notifications, categories
Julian Lam dfa9f203e6 crashing a lot less now, heh
Julian Lam adb8f80b86 interim commit - removed calls to websockets.js, beginning porting to namespaced files
psychobunny 1caaa8c20a re-initialize translator when language is changed in ACP
Julian Lam c2a1cd94d0 addressing issue for where existing NodeBBs don't have a defaultLang set
Julian Lam df4c6ca1c8 integrating client side translator into new languages tab in ACP
Julian Lam cd6af45afb added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
Julian Lam 119079ace5 added missing link, numRecentReplies, and class values to category.create... fixed , fixed
Baris Soner Usakli dda4586a2f Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli dabd2f29af closes
Julian Lam 029b91a323 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam ac04e04016 fixed
Baris Soner Usakli 3a6db04be5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli eb65c5ad1b reindex user name after change,
Julian Lam c2c1632c0e Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 2495b5b89b refactored group category permissions, removed getCategoryAccess method call
Baris Soner Usakli 176ac54cdf closes
Julian Lam ab16b1184d fixing issue where nojs mode of a private category would show the category topics, even if the requesting user was not allowed inside
Baris Soner Usakli 0d26b21a2c prevent double res.send/json if error occurs in profile image upload
Baris Soner Usakli a4ae9c70df closes , closes
Baris Soner Usakli 6f94acd0f2 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 8e6606fb5a move post
psychobunny cfa4256df5 admin - download emails.csv, thanks to @akhoury for the gist
Baris Soner Usakli 4912b8a893 fixed language regex
Baris Soner Usakli f75e55aa11 fixed path
Baris Soner Usakli d6333a3969 fixed plugin css files for relative path
Baris Soner Usakli faf5ea2122 check if we have edit permission on the pids that we want to move
Baris Soner Usakli 291aa872c4 cant fork if not logged in
Baris Soner Usakli 2e575bb2d8 closes
psychobunny 6f120ff34a closes , custom robots.txt
Baris Soner Usakli 58580bd866 closes , also moved chat to its own template
Baris Soner Usakli be316ff602 fixed mongo listRemoveAll
Baris Soner Usakli dfc8aacbae closes , removed create collection calls
Baris Soner Usakli 8c04e8e56c Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli cd6750a38d minor fix
Julian Lam 71681b936f fixed
Julian Lam 4923c79496 tweaking upgrade script
Julian Lam 3f0f5a09a0 new upgrade directive to re-slugify usernames again
Baris Soner Usakli e69611fa22 if email didnt change dont update and dont log
Baris Soner Usakli 48074ea93b redirect if category is accessed directly
Julian Lam f90beca449 Merge branch 'master' of github.com:designcreateplay/NodeBB
Julian Lam 724dcb88c0 added translator integration to emailer
Baris Soner Usakli 0edb895c2c indent
Baris Soner Usakli 981719dee1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 1466e68aa1 ssl support 101