Julian Lam
|
7edf041747
|
Merge branch 'master' of github.com:mattijle/NodeBB into mattijle-master
|
12 years ago |
|
Julian Lam
|
f51d525d9c
|
errant semicolon
|
12 years ago |
|
Julian Lam
|
d924d01677
|
timeago fix for brasilian portugueso
|
12 years ago |
|
Julian Lam
|
aa81b25fe6
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
2d72956591
|
updated language files to match english pages.json
|
12 years ago |
|
Julian Lam
|
fac55160fa
|
new translation strings for pages, proper unicode handling in parseFragment
|
12 years ago |
|
Julian Lam
|
e69f5fff3b
|
added "pages" translation file to languages
|
12 years ago |
TedVJ
|
9a876f7003
|
Fr Translation Update
|
12 years ago |
Matti Leppänen
|
98c4b08f15
|
Merge remote-tracking branch 'upstream/master'
|
12 years ago |
Leonardo Galani
|
90352cd858
|
adding brazilian portuguese language translations
|
12 years ago |
Baris Soner Usakli
|
71ccd0854d
|
fixes notification header icon
|
12 years ago |
|
Baris Soner Usakli
|
f874059fe9
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
9cb232c198
|
added header tooltips
|
12 years ago |
|
Julian Lam
|
8e1137b5dd
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
ef39c128c2
|
Removing Google Plus integration from core - adios!
|
12 years ago |
|
Baris Soner Usakli
|
31a57cf0dd
|
closes #885
|
12 years ago |
|
Baris Soner Usakli
|
d54e2fba9e
|
closes #810
|
12 years ago |
|
Matti Leppänen
|
4f495e2b46
|
quote gets added to the active composer instead of starting a new one.
|
12 years ago |
|
Baris Soner Usakli
|
c0e818afc6
|
closes #854
|
12 years ago |
|
Baris Soner Usakli
|
26673d3ada
|
delegated events in admin categories
|
12 years ago |
|
Julian Lam
|
7e3c46db61
|
Removing Twitter SSO - toodles!
|
12 years ago |
|
Julian Lam
|
e7eab83d8f
|
removing facebook SSO from core
|
12 years ago |
|
Baris Soner Usakli
|
25442a89ca
|
closes #878
|
12 years ago |
|
Julian Lam
|
0c71707fb5
|
fixed #877
|
12 years ago |
|
Julian Lam
|
0869765e2b
|
Merge remote-tracking branch 'origin/master'
|
12 years ago |
|
Julian Lam
|
22354227be
|
hiding "Forgot Password" link using Plugins.hasListeners, instead of derpy config settings bool
|
12 years ago |
|
Baris Soner Usakli
|
2560704839
|
recent unread cleanup
|
12 years ago |
|
Baris Soner Usakli
|
c6d48f477c
|
fixes recent topic post notification
|
12 years ago |
|
Baris Soner Usakli
|
14e68bc9e2
|
dropup for bottom post bar
|
12 years ago |
|
Baris Soner Usakli
|
810095d287
|
fixed infinite loading on categories
|
12 years ago |
|
Baris Soner Usakli
|
2988230b07
|
some more fixes, cant quote and see deleted messages
|
12 years ago |
|
Julian Lam
|
5fde1eb3e7
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
d42beda3da
|
added page selection if you click on the pipe
|
12 years ago |
|
Baris Soner Usakli
|
bf81159558
|
fixes a pagination bug
|
12 years ago |
|
Baris Soner Usakli
|
dcefad1427
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
1afd7ae332
|
trim pagination numberS
|
12 years ago |
|
Julian Lam
|
a240fc81ce
|
fixed #869
|
12 years ago |
|
Baris Soner Usakli
|
75f178636b
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
1084523c92
|
lots of pagination work, query params, ajaxify to pids
|
12 years ago |
|
Baris Soner Usakli
|
8744013013
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
|
12 years ago |
|
Baris Soner Usakli
|
2e786cc4d1
|
closes #873, removed global translator, templates and server objects
|
12 years ago |
|
Baris Soner Usakli
|
b23960e8d7
|
fixes to category pagination
|
12 years ago |
|
Baris Soner Usakli
|
ef6fd35e85
|
lots of cleanup, moved pagination to requirejs module
|
12 years ago |
|
Baris Soner Usakli
|
aa73a10fc4
|
added pagination to vanilla topic template
|
12 years ago |
|
Baris Soner Usakli
|
0580d0c8a3
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
|
12 years ago |
|
Baris Soner Usakli
|
5f0c6e508d
|
some cleanup
|
12 years ago |
|
Baris Soner Usakli
|
606367701f
|
pagination on posts
|
12 years ago |
psychobunny
|
0a749023cb
|
fixing if statements inside a @first / @last block
|
12 years ago |
|
Baris Soner Usakli
|
8d007e7029
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
|
12 years ago |
|
Baris Soner Usakli
|
cf39c66017
|
some pagination work
|
12 years ago |
|
Julian Lam
|
e09132350d
|
re-adding conditional to hide quote/reply block if no write perm
|
12 years ago |
|
psychobunny
|
503e59b12b
|
clean up conditionals only at the very end of parsing
|
12 years ago |
|
Julian Lam
|
26848641cd
|
restoring post/quote buttons pending template system fix for IFs
|
12 years ago |
|
Julian Lam
|
ab85ef6b7b
|
fixed issue where back button stopped ajaxifying internally.
|
12 years ago |
|
Julian Lam
|
459d5ddccd
|
fixed #867 - added proper detection so that onpopstate would not react if it was a proper page load
|
12 years ago |
|
Julian Lam
|
b587d7b5ad
|
fixed issue where calls to ajaxify.go were sending in a "template" argument that had since been removed, navigating back to NodeBB from an external link now no longer clobbers the History stack.
|
12 years ago |
|
Julian Lam
|
ef450edfea
|
Revert "possible fix to #840", please see #867
This reverts commit 1d666bf7f0.
|
12 years ago |
|
Julian Lam
|
dc7cd95f6d
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
f3bdc55348
|
little tweak to user search show timing and 10 users, sort after slicing
|
12 years ago |
|
Baris Soner Usakli
|
1d666bf7f0
|
possible fix to #840
|
12 years ago |
|
Baris Soner Usakli
|
3793ddc2e8
|
fixes user tooltips on infinit load
|
12 years ago |
|
Julian Lam
|
2af14e47b1
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
824c5072e8
|
topics should be marked read correctly if you are already in it
|
12 years ago |
|
Julian Lam
|
a0e9e52e70
|
adding xregexp to ACP header
|
12 years ago |
|
Baris Soner Usakli
|
47c32738a6
|
removed tests from acp
|
12 years ago |
|
Julian Lam
|
f02cd9df82
|
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
src/user.js
|
12 years ago |
|
Matti Leppänen
|
4cfd970d5f
|
Added Finnish language translation
|
12 years ago |
|
Julian Lam
|
1e99945515
|
Merge branch 'yangwao-master'
|
12 years ago |
|
Julian Lam
|
f0e47e43bc
|
fb and tw strings for traditional chinese
|
12 years ago |
wao
|
7b150ab407
|
added Slovak language translation
|
12 years ago |
|
Baris Soner Usakli
|
044382047d
|
removed commented out section
|
12 years ago |
|
Baris Soner Usakli
|
46fb6377ee
|
fixed topic reply if title was 255, better notif text in unread and recent,removed console.log
|
12 years ago |
|
Baris Soner Usakli
|
79803d2b3d
|
Merge branch 'favourite-spy' of https://github.com/BitBangersCode/NodeBB into BitBangersCode-favourite-spy
|
12 years ago |
MrWaffle
|
d63ced8a5c
|
Move to client side
|
12 years ago |
|
MrWaffle
|
b887b76c29
|
Implement favourite tooltip to show who favourited a post
|
12 years ago |
|
Baris Soner Usakli
|
45d2affdfb
|
closes #833
|
12 years ago |
|
Baris Soner Usakli
|
baa74958c5
|
can set image class for categories
|
12 years ago |
|
Baris Soner Usakli
|
eac6b23811
|
closes #841
|
12 years ago |
|
Barış Soner Uşaklı
|
c709fae251
|
Merge pull request #828 from BitBangersCode/admin-group-fix
Admin group fix
|
12 years ago |
|
Julian Lam
|
4c01fc4c0e
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
7db231ca54
|
traditional chinese language pack - 很好?
|
12 years ago |
|
Baris Soner Usakli
|
9393a39452
|
fixes translation in recent
|
12 years ago |
Josh
|
4c211b7110
|
Fixed tabbing/spacing
|
12 years ago |
|
Josh Rickers
|
21f6b10023
|
fixed indenting
|
12 years ago |
|
Josh Rickers
|
f9e6fab3ea
|
Fixed line spacing/tabbing
|
12 years ago |
|
Julian Lam
|
53a1474785
|
second pass for #773, blocked for now
|
12 years ago |
|
Julian Lam
|
bafc8caaf5
|
first pass at #773
|
12 years ago |
|
Josh Rickers
|
55b0270b34
|
Merge branch 'master' into admin-group-fix
|
12 years ago |
|
Josh Rickers
|
4c36083354
|
Added yourid so it can be used in groups.js
|
12 years ago |
|
Josh Rickers
|
a91e464787
|
updated groups to stop you from removing yourself from the admin group
|
12 years ago |
|
Baris Soner Usakli
|
56c789ed61
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
aa2978976c
|
notif fix
|
12 years ago |
|
Julian Lam
|
73d9d6e1d3
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
92706a6550
|
fixed #826
|
12 years ago |
|
Baris Soner Usakli
|
74ccfd1e4d
|
moved islatin out too
|
12 years ago |
|
Baris Soner Usakli
|
8f8ea4de92
|
slug fix
|
12 years ago |
|
Baris Soner Usakli
|
104ec7de6e
|
last poster is visible, slugify check for latin #777
|
12 years ago |
|
Baris Soner Usakli
|
f107803550
|
fix
|
12 years ago |
|
Baris Soner Usakli
|
039f02456d
|
if user is in the topic when a new post comes in mark the topic read
|
12 years ago |
|
Baris Soner Usakli
|
4cae491438
|
last one for the night
|
12 years ago |
|
Baris Soner Usakli
|
93534832b9
|
small
|
12 years ago |
|
Baris Soner Usakli
|
9cd2b36c97
|
minor fix to topic.tpl
|
12 years ago |
|
Baris Soner Usakli
|
a0b80e4061
|
shouldnt be in template
|
12 years ago |
|
Baris Soner Usakli
|
ccc62a202b
|
dont go to top on search icon click
|
12 years ago |
|
Baris Soner Usakli
|
0a1d45b0b9
|
default panle
|
12 years ago |
|
Baris Soner Usakli
|
56fcae1cb2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
7c16a8be31
|
recent reply fix
|
12 years ago |
|
Julian Lam
|
cc236c1f72
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
39d9dd76dc
|
removed preview button from ACP/themes
|
12 years ago |
|
Baris Soner Usakli
|
55d4a5fe3a
|
template fixes closes #825
|
12 years ago |
|
Baris Soner Usakli
|
12a5b6b4c6
|
body margin for composer
|
12 years ago |
Aziz Khoury
|
4fad334e18
|
Merge remote-tracking branch 'upstream/master'
|
12 years ago |
|
Barış Soner Uşaklı
|
94f38d0622
|
Merge pull request #822 from BitBangersCode/admin-fix
Confirmation when removing user from a group
|
12 years ago |
|
Josh
|
f7a290d0b3
|
removed function
removed function that did not work
|
12 years ago |
|
Josh
|
a86ff15f7b
|
Removed code for yourid
removed code that will give the current user id in a var called yourid
|
12 years ago |
|
Baris Soner Usakli
|
030cfbffa4
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
ed1c276739
|
only drag chat modal from header
|
12 years ago |
|
Josh
|
f14ad11dd0
|
add remove user from group confirmation
Added confirmation request when removing user from a group.
|
12 years ago |
|
Julian Lam
|
663aff4b24
|
fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL
|
12 years ago |
|
Aziz Khoury
|
ba85ffb292
|
Merge remote-tracking branch 'upstream/master'
|
12 years ago |
|
Julian Lam
|
2654a8e86a
|
added cache buster to ACP theme
|
12 years ago |
|
Julian Lam
|
f9e8178d25
|
fixed timeagago for zh_cn
|
12 years ago |
|
Aziz Khoury
|
f74f01ca77
|
Changed User.create signature to accept a hash, added a couple of utility functions as well
|
12 years ago |
|
Julian Lam
|
d6ae91312e
|
Merge branch 'master' of github.com:TheRealDrZ/NodeBB into TheRealDrZ-master
Conflicts:
public/templates/composer.tpl
|
12 years ago |
|
Julian Lam
|
95355f9036
|
added 'dir' value into language.json, added support for translator to add dir attribute to html element if necessary
|
12 years ago |
|
Julian Lam
|
895bff9b62
|
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
|
12 years ago |
|
Julian Lam
|
cf69b9fcb3
|
fixed #817 - issue where the bootswatch theme was loaded before vanilla, causing default bootstrap to override the bootswatch loaded bootstrap
|
12 years ago |
|
akhoury
|
58525bd09c
|
f'in arabs
|
12 years ago |
|
Baris Soner Usakli
|
5a069f1076
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
84aa1ab527
|
motd string and class
|
12 years ago |
|
Julian Lam
|
2cfe59f124
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
e542da1f52
|
added alphanumeric user search (instead of using reds), and exposed a proper socket call for user searching for non-admins
|
12 years ago |
|
Baris Soner Usakli
|
050ab738e4
|
fixed drop area top
|
12 years ago |
|
Baris Soner Usakli
|
d1ccc692ae
|
pull right dropdowns
|
12 years ago |
|
Baris Soner Usakli
|
c9f43a60b9
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
3d30c0bd87
|
tmp fix for nested if
|
12 years ago |
|
Julian Lam
|
3624717d84
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
07b286650c
|
adding cache buster to ACP, removing bootstrap css in ACP
|
12 years ago |
|
Baris Soner Usakli
|
32adbc8c77
|
close modal on error
|
12 years ago |
|
Baris Soner Usakli
|
7310fe82d3
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
189e69284e
|
fixes for post privileges
|
12 years ago |
|
Julian Lam
|
0ccb8a77ba
|
Merge pull request #811 from BitBangersCode/alternate_title_fix
Only alternate title when not focused
|
12 years ago |
|
Julian Lam
|
e8d6df22cb
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
5861630dec
|
- removed autocomplete in composer core (now entirely in mentions)
- upped jQuery UI to 1.10.4
|
12 years ago |
|
MrWaffle
|
c1fea52a93
|
Only alternate title when not focused
|
12 years ago |
|
Baris Soner Usakli
|
1980e945da
|
fixed admin page active sockets
|
12 years ago |
|
Baris Soner Usakli
|
16a42619b5
|
closes #809
|
12 years ago |
|
Baris Soner Usakli
|
54c05f9027
|
title is no longer centered in composer
|
12 years ago |
|
Baris Soner Usakli
|
9879f645f6
|
added check for undefined, null empty string
|
12 years ago |
|
Baris Soner Usakli
|
bbac361670
|
fixed crash if empty topic was loaded without ajaxify
|
12 years ago |