Commit Graph

1904 Commits (503e59b12b0cefb4ea0bdb1ab3b5d53cb769c719)

Author SHA1 Message Date
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