Baris Soner Usakli
|
c18788fbc9
|
crash fix if topic has no posts, and check confirm obj
|
12 years ago |
|
Baris Soner Usakli
|
8e4236a3a9
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
e4d60b7a55
|
Merge branch 'master' of https://github.com/richiepreece/NodeBB into richiepreece-master
|
12 years ago |
psychobunny
|
f8be072b99
|
chats - isNew flag, and sending in userData.uid now
|
12 years ago |
|
Baris Soner Usakli
|
d54e2fba9e
|
closes #810
|
12 years ago |
|
Baris Soner Usakli
|
fb8fbb2372
|
removed console.log
|
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
|
25c4648e2e
|
load 20 in recent
|
12 years ago |
|
Baris Soner Usakli
|
8770284661
|
removed console.log
|
12 years ago |
|
Baris Soner Usakli
|
8d0b880e5a
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
25442a89ca
|
closes #878
|
12 years ago |
|
psychobunny
|
6ab08e91a2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
psychobunny
|
45a5b88824
|
added filter:messaging.parse hook
|
12 years ago |
|
Baris Soner Usakli
|
fac2cd9464
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
da626a4035
|
more fixes
|
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 |
|
Julian Lam
|
96b2a15290
|
user registration now no longer sends a welcome email if no emailers are present
|
12 years ago |
|
Julian Lam
|
d7d4290099
|
resolved #879
|
12 years ago |
|
Baris Soner Usakli
|
bd0b5f4cdb
|
more error checks in thread move
|
12 years ago |
|
Baris Soner Usakli
|
2988230b07
|
some more fixes, cant quote and see deleted messages
|
12 years ago |
|
Baris Soner Usakli
|
1afd7ae332
|
trim pagination numberS
|
12 years ago |
|
Baris Soner Usakli
|
6628db89af
|
added saerch array
|
12 years ago |
|
Baris Soner Usakli
|
b4ea8e58fa
|
removed check for no topics in category, you should be able to go into empty categories
|
12 years ago |
|
Baris Soner Usakli
|
6ff11c5243
|
check for number
|
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 |
MrWaffle
|
869f9e0d86
|
Add custom templates to /api/get_templates_listing
|
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
|
393bb7245c
|
closes #866
|
12 years ago |
|
Baris Soner Usakli
|
d718eca935
|
fixes global meta leak, and categories meta require, #873
|
12 years ago |
|
psychobunny
|
46e29dfb2b
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
psychobunny
|
d67ae5c2be
|
changing undetected minified JS file warning to info message instead
|
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
|
0580d0c8a3
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB into pagination
|
12 years ago |
|
Baris Soner Usakli
|
606367701f
|
pagination on posts
|
12 years ago |
|
Julian Lam
|
d5534cf545
|
fixing upgrade script on edge builds
|
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
|
a3fe390810
|
reverting change to User.search that added "timing" to the return of User.search. Such a change can only be made for 0.4.0, sorry!
|
12 years ago |
|
Baris Soner Usakli
|
620ff65cbe
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
7f23f848fe
|
fix for mismatch between favourite count and number of people in favourited seT
|
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
|
43808c01ec
|
reduced the number of 'ajaxify.go' calls to one, in /src
|
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
|
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 |
akhoury
|
dcc6ec797e
|
removed use_proxy config, cleaned-up some comments and sneaked in a time log print on initialization, also, related to pull#820
|
12 years ago |
|
Baris Soner Usakli
|
b0ef974590
|
lots of cleanup and refactor
|
12 years ago |
|
Baris Soner Usakli
|
f62c82c797
|
send app to action:app.load
|
12 years ago |
|
Baris Soner Usakli
|
bc1cde38da
|
added getObjectKeys for julian :)
|
12 years ago |
|
Julian Lam
|
2af14e47b1
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
d380f69310
|
support for "registered users" and "administrators" in access control (categories). Renamed "Administrators" group to "administrators", and made hidden
|
12 years ago |
|
Baris Soner Usakli
|
824c5072e8
|
topics should be marked read correctly if you are already in it
|
12 years ago |
|
Julian Lam
|
f02cd9df82
|
Merge branch 'master' of github.com:akhoury/NodeBB into akhoury-master
Conflicts:
src/user.js
|
12 years ago |
|
Aziz Khoury
|
659817b4f1
|
Update comment
|
12 years ago |
|
Aziz Khoury
|
7e3d8d65f5
|
Update login.js
|
12 years ago |
|
Baris Soner Usakli
|
b717c74a81
|
closes #856
|
12 years ago |
|
Baris Soner Usakli
|
042174290f
|
removed console.log
|
12 years ago |
|
Baris Soner Usakli
|
b325212182
|
crash fix for admin verify email, temp fix
|
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
|
03d92eb5cd
|
Thought I'd refactor this for you guys
|
12 years ago |
|
MrWaffle
|
da317b5a85
|
async wooo
|
12 years ago |
|
MrWaffle
|
c0e2e9d011
|
Remove log
|
12 years ago |
|
MrWaffle
|
69b54337bb
|
Limit to 5 users
|
12 years ago |
|
Baris Soner Usakli
|
b945dfc71d
|
closes #843
|
12 years ago |
|
MrWaffle
|
b887b76c29
|
Implement favourite tooltip to show who favourited a post
|
12 years ago |
|
Baris Soner Usakli
|
baa74958c5
|
can set image class for categories
|
12 years ago |
|
Barış Soner Uşaklı
|
c709fae251
|
Merge pull request #828 from BitBangersCode/admin-group-fix
Admin group fix
|
12 years ago |
Richie Preece
|
d959aad41f
|
Changed to bcrypt.js
|
12 years ago |
|
Baris Soner Usakli
|
18075b85c7
|
winston.error
|
12 years ago |
|
Baris Soner Usakli
|
e997c63480
|
return error
|
12 years ago |
|
psychobunny
|
3b4f0a8f4e
|
updating motd for incoming theme
|
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
|
bac1a5ec3e
|
updated groups to stop you from removing yourself from the admin group
|
12 years ago |
|
Julian Lam
|
397861c3cc
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
0020f278a5
|
stopped using unnecessary regex in user search
|
12 years ago |
|
Baris Soner Usakli
|
aa2978976c
|
notif fix
|
12 years ago |
|
Baris Soner Usakli
|
a1149b8f8d
|
notif unread class
|
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
|
9400e5bcc9
|
motd
|
12 years ago |
|
Baris Soner Usakli
|
f282dcd677
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
55d4a5fe3a
|
template fixes closes #825
|
12 years ago |
|
Julian Lam
|
affa51856b
|
closed #801 pending explanation
|
12 years ago |
|
Aziz Khoury
|
da647d105b
|
removing couple of console.log
|
12 years ago |
|
Aziz Khoury
|
74f23497dc
|
password should be passed to action hook, and it was being ovewritten
|
12 years ago |
|
Aziz Khoury
|
a13c321de8
|
added "trust proxy" config option with default to true
|
12 years ago |
|
Aziz Khoury
|
ba85ffb292
|
Merge remote-tracking branch 'upstream/master'
|
12 years ago |
|
Baris Soner Usakli
|
71888adb09
|
closes #815, closes #816
|
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
|
e2960e3ed6
|
Merge pull request #819 from BitBangersCode/mongo-fix
Add callback to mongo.searchRemove, fixes infinite schema update
|
12 years ago |
|
MrWaffle
|
e4d8ddcf1b
|
Add callback to mongo.removeSearch, fixes infinite schema update
|
12 years ago |
|
Julian Lam
|
e1a9fe9691
|
Merge branch 'WindowsFix' of github.com:BitBangersCode/NodeBB into BitBangersCode-WindowsFix
Conflicts:
src/webserver.js
|
12 years ago |
|
Julian Lam
|
938b78786e
|
closed #818 - case insensitive user search
|
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
|
ee6ac77f8b
|
new upgrade directive
|
12 years ago |
|
Julian Lam
|
b6aa31b245
|
removed references to Reds user search
|
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 |
|
Julian Lam
|
483ad87c1d
|
first pass
|
12 years ago |
|
Julian Lam
|
cfe46f38ee
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
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.
|
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
|
4273fc4d23
|
added check for valid field
|
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
|
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 |
|
Baris Soner Usakli
|
1980e945da
|
fixed admin page active sockets
|
12 years ago |
|
Baris Soner Usakli
|
16a42619b5
|
closes #809
|
12 years ago |
|
Baris Soner Usakli
|
bbac361670
|
fixed crash if empty topic was loaded without ajaxify
|
12 years ago |
|
Baris Soner Usakli
|
84cbcc5a97
|
closes #798
|
12 years ago |
|
psychobunny
|
025e1293fa
|
removed deprecated cssSrc, replaced with optional bootswatchCSS
|
12 years ago |
|
Baris Soner Usakli
|
959e6e83ea
|
closes #796
|
12 years ago |
|
MrWaffle
|
5ed77b032e
|
Fix plugin CSS files on Windows
|
12 years ago |
|
Baris Soner Usakli
|
dc27638ca8
|
sitemap fix
|
12 years ago |
|
Baris Soner Usakli
|
c00bd0b8d0
|
oops fixed
|
12 years ago |
|
Baris Soner Usakli
|
22e1b0f22e
|
check result for null
|
12 years ago |
|
Baris Soner Usakli
|
e6a9f5a704
|
error check
|
12 years ago |
|
Baris Soner Usakli
|
fd92d7b02a
|
can mark topic unread for all
|
12 years ago |
|
Baris Soner Usakli
|
00c6fc17ac
|
removed console.log
|
12 years ago |
|
Baris Soner Usakli
|
24ceb0f083
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
48eb6a3f22
|
composer changeS
|
12 years ago |
|
Julian Lam
|
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 |
|
Julian Lam
|
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 |
|
Julian Lam
|
962955f06a
|
fixed bug with search (getTopicsByTids became error-first)
|
12 years ago |
|
Baris Soner Usakli
|
e884ff1f59
|
modules fixes
|
12 years ago |
|
Baris Soner Usakli
|
a34775a6c2
|
meta fixes
|
12 years ago |
|
Baris Soner Usakli
|
c0712583f2
|
fixed category sockets
|
12 years ago |
|
Baris Soner Usakli
|
d72926a5bb
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
a802dc4b68
|
admin.js socket fixes
|
12 years ago |
|
Julian Lam
|
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 |
|
Julian Lam
|
727ad4b651
|
added cache buster to nodebb.min.js even if it has not changed
|
12 years ago |
|
Julian Lam
|
5e695d3222
|
fixed incorrect language string used in fb button in default motd
|
12 years ago |
|
Julian Lam
|
45ce0566e7
|
added translation to default MOTD
|
12 years ago |
|
Julian Lam
|
14b31cf4c8
|
hiding fork button on xs/sm devices (default motd)
|
12 years ago |
|
Julian Lam
|
beec96416f
|
added translation to default MOTD
|
12 years ago |
|
Julian Lam
|
253913f8d9
|
hiding fork button on xs/sm devices (default motd)
|
12 years ago |
|
Baris Soner Usakli
|
cfaa6556d6
|
pass err
|
12 years ago |
|
Baris Soner Usakli
|
b062af2c4b
|
fixed user pwd reset
|
12 years ago |
|
Baris Soner Usakli
|
b3816b98a1
|
more post fixes
|
12 years ago |
|
Baris Soner Usakli
|
31d353ab0e
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
8740cc0fc7
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
ae76bb3928
|
lots of err first fixeS
|
12 years ago |
|
Julian Lam
|
111776d878
|
notifications socket callbacks
|
12 years ago |
|
Julian Lam
|
e95da77fe8
|
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Julian Lam
|
bc48ba874d
|
fixed module.js callback format
|
12 years ago |
|
Baris Soner Usakli
|
ced37044ca
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
426d3e871f
|
more fixes
|
12 years ago |
|
Julian Lam
|
cbb630fd6b
|
fixed categories.js socket callbacks
|
12 years ago |
|
Julian Lam
|
8041bee9fd
|
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
6da6baa213
|
more crash fixes to socketS
|
12 years ago |
|
Baris Soner Usakli
|
ba8e98520c
|
added data checks to user calls
|
12 years ago |
|
Baris Soner Usakli
|
4366c11ec0
|
users.js fix
|
12 years ago |
|
Baris Soner Usakli
|
39b631a3a8
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
e061978bd5
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
2515ba9455
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
afe97233aa
|
more fixes
|
12 years ago |
|
Julian Lam
|
8b1ed1297b
|
linting
|
12 years ago |
|
Julian Lam
|
765402a2a0
|
fixed ACP online count
|
12 years ago |
|
Baris Soner Usakli
|
e5c8caf5ff
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
1ec21c2bfd
|
metatitle
|
12 years ago |
|
Baris Soner Usakli
|
7470c1bbd9
|
more fixes
|
12 years ago |
|
Baris Soner Usakli
|
2893693d17
|
Merge branch 'socketAL-fix' of https://github.com/designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Baris Soner Usakli
|
0b132cadcf
|
user fixes
|
12 years ago |
|
Julian Lam
|
3177fdfa74
|
partially fixed acp active users
|
12 years ago |
|
Julian Lam
|
08f97efcd4
|
Merge branch 'socketAL-fix' of github.com:designcreateplay/NodeBB into socketAL-fix
|
12 years ago |
|
Julian Lam
|
71f1f7137a
|
fixes
|
12 years ago |
|
Baris Soner Usakli
|
220b40ff9c
|
topics.js
|
12 years ago |
|
Julian Lam
|
97eff9c8a1
|
fixing index call and meta.js
|
12 years ago |
|
Baris Soner Usakli
|
adf4a5c407
|
user.js changes
|
12 years ago |
|
Julian Lam
|
42d6880ac4
|
migrating posts to new socketAL format
|
12 years ago |
|
Julian Lam
|
35aa06c230
|
migrating notifications to new socketAL format
|
12 years ago |
|
Julian Lam
|
be3284e05e
|
migrating modules.js to new socketAL style
|
12 years ago |
|
Baris Soner Usakli
|
8bb24fa034
|
fixed update header
|
12 years ago |
|
Julian Lam
|
2235dbd2a0
|
migrating meta.js to new socketAL format
|
12 years ago |
|
Baris Soner Usakli
|
f6bd52014e
|
fixed conflict
|
12 years ago |
|
Baris Soner Usakli
|
accde93fff
|
removed api: from server
|
12 years ago |
|
Julian Lam
|
69a9570186
|
migrated catefories.js to new socketAL format
|
12 years ago |
|
Julian Lam
|
c215e61541
|
fixed up admin.js
|
12 years ago |
|
Julian Lam
|
4184574164
|
WIP admin.js socket underping
|
12 years ago |
|
Baris Soner Usakli
|
d234dbdca2
|
first set of changes
|
12 years ago |
|
Julian Lam
|
a48a7acd51
|
fixing issue where after a user changed their username, the new name was not reindexed by Reds
|
12 years ago |
|
Baris Soner Usakli
|
16aeb2d09d
|
added fb to motd default
|
12 years ago |
|
Baris Soner Usakli
|
e16c3f3f80
|
added try catch to socket calls
|
12 years ago |
|
MrWaffle
|
b78dc3eca8
|
Chat now supports markdown
|
12 years ago |
|
Baris Soner Usakli
|
cd4cb240c8
|
upload file icon in composer was visible even when uploads were disabled
|
12 years ago |
|
Julian Lam
|
7de540dc74
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
b3f23d41d3
|
fixed #744
|
12 years ago |
|
Baris Soner Usakli
|
466c02a886
|
removed teaser_text
|
12 years ago |