Commit Graph

3259 Commits (e2960e3ed6698fe8b83ce7d9c46e44de20e27d99)
 

Author SHA1 Message Date
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 d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
	public/templates/composer.tpl
Julian Lam e1a9fe9691 Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
	src/webserver.js
Julian Lam 33c84d4684 Merge branch 'akhoury-master'
Julian Lam 95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
Julian Lam 938b78786e closed - case insensitive user search
Julian Lam 895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Julian Lam cf69b9fcb3 fixed - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
akhoury 58525bd09c f'in arabs
Baris Soner Usakli 5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 84aa1ab527 motd string and class
Julian Lam 2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB
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
Baris Soner Usakli f7aa808fa7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 050ab738e4 fixed drop area top
Julian Lam 483ad87c1d first pass
Julian Lam cfe46f38ee Merge branch 'master' of github.com:designcreateplay/NodeBB
Baris Soner Usakli d1ccc692ae pull right dropdowns
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 32adbc8c77 close modal on error
Baris Soner Usakli 7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 189e69284e fixes for post privileges
Julian Lam 0ccb8a77ba Merge pull request from BitBangersCode/alternate_title_fix
Only alternate title when not focused
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
MrWaffle c1fea52a93 Only alternate title when not focused
Baris Soner Usakli 1980e945da fixed admin page active sockets
Baris Soner Usakli 16a42619b5 closes
Baris Soner Usakli 54c05f9027 title is no longer centered in composer
Baris Soner Usakli 9879f645f6 added check for undefined, null empty string
Baris Soner Usakli bbac361670 fixed crash if empty topic was loaded without ajaxify
Baris Soner Usakli 84cbcc5a97 closes
Baris Soner Usakli 8c1c844007 closes
Baris Soner Usakli 1dddd77ae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 72447c9b9c grouped post buttons in dropdowns
psychobunny 025e1293fa removed deprecated cssSrc, replaced with optional bootswatchCSS
psychobunny df53d836e5 fixed dependency check for cerulean
Baris Soner Usakli e83e7870ce Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli d8e14acbbf closes
psychobunny 4ef5ffe7fd upped minver of cerulean to 0.0.12 - please upgrade
Baris Soner Usakli 5072b9c8a5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB
Baris Soner Usakli 959e6e83ea closes