4fad334e18
Merge remote-tracking branch 'upstream/master'
11 years ago
94f38d0622
Merge pull request #822 from BitBangersCode/admin-fix
...
Confirmation when removing user from a group
11 years ago
f7a290d0b3
removed function
...
removed function that did not work
11 years ago
a86ff15f7b
Removed code for yourid
...
removed code that will give the current user id in a var called yourid
11 years ago
030cfbffa4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
ed1c276739
only drag chat modal from header
11 years ago
f14ad11dd0
add remove user from group confirmation
...
Added confirmation request when removing user from a group.
11 years ago
663aff4b24
fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL
11 years ago
ba85ffb292
Merge remote-tracking branch 'upstream/master'
11 years ago
2654a8e86a
added cache buster to ACP theme
11 years ago
f9e8178d25
fixed timeagago for zh_cn
11 years ago
f74f01ca77
Changed User.create signature to accept a hash, added a couple of utility functions as well
11 years ago
d6ae91312e
Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
...
Conflicts:
public/templates/composer.tpl
11 years ago
95355f9036
added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
11 years ago
895bff9b62
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
11 years ago
cf69b9fcb3
fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
11 years ago
58525bd09c
f'in arabs
11 years ago
5a069f1076
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
84aa1ab527
motd string and class
11 years ago
2cfe59f124
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
e542da1f52
added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
11 years ago
050ab738e4
fixed drop area top
11 years ago
d1ccc692ae
pull right dropdowns
11 years ago
c9f43a60b9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
3d30c0bd87
tmp fix for nested if
11 years ago
3624717d84
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
07b286650c
adding cache buster to ACP, removing bootstrap css in ACP
11 years ago
32adbc8c77
close modal on error
11 years ago
7310fe82d3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
189e69284e
fixes for post privileges
11 years ago
0ccb8a77ba
Merge pull request #811 from BitBangersCode/alternate_title_fix
...
Only alternate title when not focused
11 years ago
e8d6df22cb
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
5861630dec
- removed autocomplete in composer core (now entirely in mentions)
...
- upped jQuery UI to 1.10.4
11 years ago
c1fea52a93
Only alternate title when not focused
11 years ago
1980e945da
fixed admin page active sockets
11 years ago
16a42619b5
closes #809
11 years ago
54c05f9027
title is no longer centered in composer
11 years ago
9879f645f6
added check for undefined, null empty string
11 years ago
bbac361670
fixed crash if empty topic was loaded without ajaxify
11 years ago
8c1c844007
closes #806
11 years ago
1dddd77ae1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
72447c9b9c
grouped post buttons in dropdowns
11 years ago
025e1293fa
removed deprecated cssSrc, replaced with optional bootswatchCSS
11 years ago
d8e14acbbf
closes #799
11 years ago
5072b9c8a5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
959e6e83ea
closes #796
11 years ago
1528c70a30
deleted BS css files from core - please update vanilla
11 years ago
43cc975ff7
Add Simplized Chinese.
...
Just modified the .json in language folder and some .tpl in the
templates folder(except the admin folder). Noted there are a lot of
front-end related code in the .js files, I’ll move on to them.
11 years ago
b5ed7b8b72
Fr translation fixes
11 years ago
a2165403a7
Fr translation for fd92d7b02a
11 years ago
Aziz Khoury
Barış Soner Uşaklı
Josh
Julian Lam
MrWaffle
psychobunny
Dr.Z
TedVJ