Commit Graph

3708 Commits

Author SHA1 Message Date
MrWaffle
e4d8ddcf1b Add callback to mongo.removeSearch, fixes infinite schema update 2014-01-20 17:21:45 +01:00
Julian Lam
d6ae91312e Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
	public/templates/composer.tpl
2014-01-20 11:15:16 -05:00
Julian Lam
e1a9fe9691 Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
	src/webserver.js
2014-01-20 11:08:41 -05:00
Julian Lam
33c84d4684 Merge branch 'akhoury-master' 2014-01-20 11:04:10 -05:00
Julian Lam
95355f9036 added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary 2014-01-20 11:04:06 -05:00
Julian Lam
938b78786e closed #818 - case insensitive user search 2014-01-20 10:55:29 -05:00
Julian Lam
895bff9b62 Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master 2014-01-20 10:48:06 -05:00
Julian Lam
cf69b9fcb3 fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap 2014-01-20 10:46:49 -05:00
akhoury
58525bd09c f'in arabs 2014-01-20 01:39:11 -05:00
Baris Soner Usakli
5a069f1076 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:44:16 -05:00
Baris Soner Usakli
84aa1ab527 motd string and class 2014-01-19 22:44:13 -05:00
Julian Lam
2cfe59f124 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 22:29:36 -05:00
Julian Lam
ee6ac77f8b new upgrade directive 2014-01-19 22:29:28 -05:00
Julian Lam
b6aa31b245 removed references to Reds user search 2014-01-19 22:11:34 -05:00
Julian Lam
e542da1f52 added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins 2014-01-19 22:07:29 -05:00
Baris Soner Usakli
f7aa808fa7 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 22:06:33 -05:00
Baris Soner Usakli
050ab738e4 fixed drop area top 2014-01-19 22:06:25 -05:00
Julian Lam
483ad87c1d first pass 2014-01-19 21:46:39 -05:00
Julian Lam
cfe46f38ee Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:35:23 -05:00
Baris Soner Usakli
d1ccc692ae pull right dropdowns 2014-01-19 18:35:18 -05:00
Julian Lam
0c0ae6560a re: #808 -- 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. 2014-01-19 18:34:11 -05:00
Baris Soner Usakli
c9f43a60b9 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 18:18:55 -05:00
Baris Soner Usakli
3d30c0bd87 tmp fix for nested if 2014-01-19 18:18:47 -05:00
Julian Lam
3624717d84 Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 18:02:07 -05:00
Julian Lam
07b286650c adding cache buster to ACP, removing bootstrap css in ACP 2014-01-19 18:02:03 -05:00
Baris Soner Usakli
4273fc4d23 added check for valid field 2014-01-19 18:02:01 -05:00
Baris Soner Usakli
32adbc8c77 close modal on error 2014-01-19 17:49:16 -05:00
Baris Soner Usakli
7310fe82d3 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-19 17:28:15 -05:00
Baris Soner Usakli
189e69284e fixes for post privileges 2014-01-19 17:28:08 -05:00
Julian Lam
0ccb8a77ba Merge pull request #811 from BitBangersCode/alternate_title_fix
Only alternate title when not focused
2014-01-19 14:25:15 -08:00
Julian Lam
e8d6df22cb Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-19 17:18:18 -05:00
Julian Lam
5861630dec - removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
2014-01-19 17:17:40 -05:00
MrWaffle
c1fea52a93 Only alternate title when not focused 2014-01-19 22:38:44 +01:00
Baris Soner Usakli
1980e945da fixed admin page active sockets 2014-01-19 14:42:47 -05:00
Baris Soner Usakli
16a42619b5 closes #809 2014-01-19 14:27:07 -05:00
Baris Soner Usakli
54c05f9027 title is no longer centered in composer 2014-01-19 12:59:45 -05:00
Baris Soner Usakli
9879f645f6 added check for undefined, null empty string 2014-01-18 23:28:13 -05:00
Baris Soner Usakli
bbac361670 fixed crash if empty topic was loaded without ajaxify 2014-01-18 23:18:58 -05:00
Baris Soner Usakli
84cbcc5a97 closes #798 2014-01-18 22:23:25 -05:00
Baris Soner Usakli
8c1c844007 closes #806 2014-01-18 21:57:06 -05:00
Baris Soner Usakli
1dddd77ae1 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 19:15:17 -05:00
Baris Soner Usakli
72447c9b9c grouped post buttons in dropdowns 2014-01-18 19:15:07 -05:00
psychobunny
025e1293fa removed deprecated cssSrc, replaced with optional bootswatchCSS 2014-01-18 16:13:01 -05:00
psychobunny
df53d836e5 fixed dependency check for cerulean 2014-01-18 16:01:14 -05:00
Baris Soner Usakli
e83e7870ce Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 16:00:12 -05:00
Baris Soner Usakli
d8e14acbbf closes #799 2014-01-18 16:00:05 -05:00
psychobunny
4ef5ffe7fd upped minver of cerulean to 0.0.12 - please upgrade 2014-01-18 15:59:39 -05:00
Baris Soner Usakli
5072b9c8a5 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-18 15:35:58 -05:00
Baris Soner Usakli
959e6e83ea closes #796 2014-01-18 15:35:51 -05:00
psychobunny
1528c70a30 deleted BS css files from core - please update vanilla 2014-01-18 15:12:49 -05:00