f02cd9df82
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
...
Conflicts:
src/user.js
12 years ago
4cfd970d5f
Added Finnish language translation
12 years ago
1e99945515
Merge branch 'yangwao-master'
12 years ago
f0e47e43bc
fb and tw strings for traditional chinese
12 years ago
7b150ab407
added Slovak language translation
12 years ago
044382047d
removed commented out section
12 years ago
46fb6377ee
fixed topic reply if title was 255, better notif text in unread and recent,removed console.log
12 years ago
79803d2b3d
Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy
12 years ago
d63ced8a5c
Move to client side
12 years ago
b887b76c29
Implement favourite tooltip to show who favourited a post
12 years ago
45d2affdfb
closes #833
12 years ago
baa74958c5
can set image class for categories
12 years ago
eac6b23811
closes #841
12 years ago
c709fae251
Merge pull request #828 from BitBangersCode/admin-group-fix
...
Admin group fix
12 years ago
4c01fc4c0e
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
7db231ca54
traditional chinese language pack - 很好?
12 years ago
9393a39452
fixes translation in recent
12 years ago
4c211b7110
Fixed tabbing/spacing
12 years ago
21f6b10023
fixed indenting
12 years ago
f9e6fab3ea
Fixed line spacing/tabbing
12 years ago
53a1474785
second pass for #773 , blocked for now
12 years ago
bafc8caaf5
first pass at #773
12 years ago
55b0270b34
Merge branch 'master' into admin-group-fix
12 years ago
4c36083354
Added yourid so it can be used in groups.js
12 years ago
a91e464787
updated groups to stop you from removing yourself from the admin group
12 years ago
56c789ed61
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
aa2978976c
notif fix
12 years ago
73d9d6e1d3
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
92706a6550
fixed #826
12 years ago
74ccfd1e4d
moved islatin out too
12 years ago
8f8ea4de92
slug fix
12 years ago
104ec7de6e
last poster is visible, slugify check for latin #777
12 years ago
f107803550
fix
12 years ago
039f02456d
if user is in the topic when a new post comes in mark the topic read
12 years ago
4cae491438
last one for the night
12 years ago
93534832b9
small
12 years ago
9cd2b36c97
minor fix to topic.tpl
12 years ago
a0b80e4061
shouldnt be in template
12 years ago
ccc62a202b
dont go to top on search icon click
12 years ago
0a1d45b0b9
default panle
12 years ago
56fcae1cb2
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
7c16a8be31
recent reply fix
12 years ago
cc236c1f72
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
39d9dd76dc
removed preview button from ACP/themes
12 years ago
55d4a5fe3a
template fixes closes #825
12 years ago
12a5b6b4c6
body margin for composer
12 years ago
4fad334e18
Merge remote-tracking branch 'upstream/master'
12 years ago
94f38d0622
Merge pull request #822 from BitBangersCode/admin-fix
...
Confirmation when removing user from a group
12 years ago
f7a290d0b3
removed function
...
removed function that did not work
12 years ago
a86ff15f7b
Removed code for yourid
...
removed code that will give the current user id in a var called yourid
12 years ago
030cfbffa4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
ed1c276739
only drag chat modal from header
12 years ago
f14ad11dd0
add remove user from group confirmation
...
Added confirmation request when removing user from a group.
12 years ago
663aff4b24
fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL
12 years ago
ba85ffb292
Merge remote-tracking branch 'upstream/master'
12 years ago
2654a8e86a
added cache buster to ACP theme
12 years ago
f9e8178d25
fixed timeagago for zh_cn
12 years ago
f74f01ca77
Changed User.create signature to accept a hash, added a couple of utility functions as well
12 years ago
d6ae91312e
Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
...
Conflicts:
public/templates/composer.tpl
12 years ago
95355f9036
added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
12 years ago
895bff9b62
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
12 years ago
cf69b9fcb3
fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
12 years ago
58525bd09c
f'in arabs
12 years ago
5a069f1076
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
84aa1ab527
motd string and class
12 years ago
2cfe59f124
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
e542da1f52
added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
12 years ago
050ab738e4
fixed drop area top
12 years ago
d1ccc692ae
pull right dropdowns
12 years ago
c9f43a60b9
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
3d30c0bd87
tmp fix for nested if
12 years ago
3624717d84
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
07b286650c
adding cache buster to ACP, removing bootstrap css in ACP
12 years ago
32adbc8c77
close modal on error
12 years ago
7310fe82d3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
189e69284e
fixes for post privileges
12 years ago
0ccb8a77ba
Merge pull request #811 from BitBangersCode/alternate_title_fix
...
Only alternate title when not focused
12 years ago
e8d6df22cb
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
5861630dec
- removed autocomplete in composer core (now entirely in mentions)
...
- upped jQuery UI to 1.10.4
12 years ago
c1fea52a93
Only alternate title when not focused
12 years ago
1980e945da
fixed admin page active sockets
12 years ago
16a42619b5
closes #809
12 years ago
54c05f9027
title is no longer centered in composer
12 years ago
9879f645f6
added check for undefined, null empty string
12 years ago
bbac361670
fixed crash if empty topic was loaded without ajaxify
12 years ago
8c1c844007
closes #806
12 years ago
1dddd77ae1
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
72447c9b9c
grouped post buttons in dropdowns
12 years ago
025e1293fa
removed deprecated cssSrc, replaced with optional bootswatchCSS
12 years ago
d8e14acbbf
closes #799
12 years ago
5072b9c8a5
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
959e6e83ea
closes #796
12 years ago
1528c70a30
deleted BS css files from core - please update vanilla
12 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.
12 years ago
b5ed7b8b72
Fr translation fixes
12 years ago
a2165403a7
Fr translation for fd92d7b02a
12 years ago
324bec41c4
chain
12 years ago
0db6423c26
closes #792 , fixes multiple composers
12 years ago
fd92d7b02a
can mark topic unread for all
12 years ago
25b50323fa
markdown text in composer
12 years ago
4e5dfbc1c9
find .post-row instead of any li
12 years ago
24ceb0f083
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
48eb6a3f22
composer changeS
12 years ago
123f92ca1e
fixed #711
12 years ago
917dfe74e6
removing console log and removing a bit of code that would cause infinite loader to take 2.5s extra each round :P
12 years ago
d8c4609ee0
fixed #649 - 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%.
12 years ago
51abf60b3a
Merge branch 'socketAL-fix'
12 years ago
48c22567c2
fixed #791
12 years ago
17f98804c6
commented out "remember me" checkbox because it actually does nothing... :x
12 years ago
c0712583f2
fixed category sockets
12 years ago
d72926a5bb
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
12 years ago
a802dc4b68
admin.js socket fixes
12 years ago
af6eb5359e
Merge branch 'master' into socketAL-fix
...
Conflicts:
public/language/cs/global.json
public/language/fr/global.json
src/routes/api.js
12 years ago
27762c2ab9
Fr Translation update #3
12 years ago
f63ab0faeb
Fr Translation update #2
12 years ago
cfbbc238f6
Fr Translation Update
12 years ago
2b32ede4d8
fixed czech welcome message
12 years ago
04da0447b5
fixed global:motd.get in es
12 years ago
45ce0566e7
added translation to default MOTD
12 years ago
c1c9438220
patching translator to ignore non-js files
12 years ago
13ae2e9401
fixed global:motd.get in es
12 years ago
beec96416f
added translation to default MOTD
12 years ago
7e9d344487
patching translator to ignore non-js files
12 years ago
b062af2c4b
fixed user pwd reset
12 years ago
b7f0c90bf7
more fixes
12 years ago
b3816b98a1
more post fixes
12 years ago
9e6f7fa960
reset
12 years ago
31d353ab0e
more fixes
12 years ago
3a57c3b6d8
removed disabled attrib from reset button
12 years ago
8740cc0fc7
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
12 years ago
ae76bb3928
lots of err first fixeS
12 years ago
111776d878
notifications socket callbacks
12 years ago
e95da77fe8
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
12 years ago
bc48ba874d
fixed module.js callback format
12 years ago
ced37044ca
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
12 years ago
426d3e871f
more fixes
12 years ago
cbb630fd6b
fixed categories.js socket callbacks
12 years ago
ddb9a4a60e
fixed user load more
12 years ago
4366c11ec0
users.js fix
12 years ago
39b631a3a8
more fixes
12 years ago
e061978bd5
more fixes
12 years ago
2515ba9455
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
12 years ago
afe97233aa
more fixes
12 years ago
765402a2a0
fixed ACP online count
12 years ago
e5c8caf5ff
more fixes
12 years ago
1ec21c2bfd
metatitle
12 years ago
7470c1bbd9
more fixes
12 years ago
3177fdfa74
partially fixed acp active users
12 years ago
8bb24fa034
fixed update header
12 years ago
c215e61541
fixed up admin.js
12 years ago
Julian Lam
Matti Leppänen
wao
Baris Soner Usakli
MrWaffle
Josh
Aziz Khoury
psychobunny
Dr.Z
TedVJ