Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-12 00:45:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,277 Commits 75 Branches 483 Tags
dc8839b63c5244cf48c194b5150ff588990b84d8
Commit Graph

4277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aziz Khoury
da647d105b removing couple of console.log 2014-01-20 16:34:12 -05:00
Aziz Khoury
74f23497dc password should be passed to action hook, and it was being ovewritten 2014-01-20 16:29:46 -05:00
Aziz Khoury
4fad334e18 Merge remote-tracking branch 'upstream/master' 2014-01-20 16:21:57 -05:00
Barış Soner Uşaklı
94f38d0622 Merge pull request #822 from BitBangersCode/admin-fix 
Confirmation when removing user from a group
 2014-01-20 13:18:52 -08:00
Josh
f7a290d0b3 removed function 
removed function that did not work
 2014-01-20 20:55:53 +00:00
Josh
a86ff15f7b Removed code for yourid 
removed code that will give the current user id in a var called yourid
 2014-01-20 20:54:19 +00:00
Baris Soner Usakli
030cfbffa4 Merge branch 'master' of https://github.com/designcreateplay/NodeBB 2014-01-20 15:35:17 -05:00
Baris Soner Usakli
ed1c276739 only drag chat modal from header 2014-01-20 15:35:10 -05:00
Josh
f14ad11dd0 add remove user from group confirmation 
Added confirmation request when removing user from a group.
 2014-01-20 20:28:46 +00:00
Julian Lam
9c9fadb5a1 upping mentions minver 2014-01-20 14:53:09 -05:00
Julian Lam
663aff4b24 fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL 2014-01-20 13:41:46 -05:00
Aziz Khoury
a13c321de8 added "trust proxy" config option with default to true 2014-01-20 13:23:40 -05:00
Aziz Khoury
ba85ffb292 Merge remote-tracking branch 'upstream/master' 2014-01-20 13:22:16 -05:00
Julian Lam
2654a8e86a added cache buster to ACP theme 2014-01-20 13:22:03 -05:00
Julian Lam
cef54fbf6d Merge branch 'master' of github.com:designcreateplay/NodeBB 2014-01-20 13:17:17 -05:00
Julian Lam
f9e8178d25 fixed timeagago for zh_cn 2014-01-20 13:16:23 -05:00
Baris Soner Usakli
71888adb09 closes #815, closes #816 2014-01-20 12:56:09 -05:00
Aziz Khoury
f74f01ca77 Changed User.create signature to accept a hash, added a couple of utility functions as well 2014-01-20 12:41:35 -05:00
Julian Lam
e2960e3ed6 Merge pull request #819 from BitBangersCode/mongo-fix 
Add callback to mongo.searchRemove, fixes infinite schema update
 2014-01-20 08:28:23 -08:00
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