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 |
|
Baris Soner Usakli
|
265d1f6331
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
dcf47f558e
|
limit search in db
|
12 years ago |
|
Julian Lam
|
facacc65aa
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
442c543d27
|
fixed #776
|
12 years ago |
psychobunny
|
8c5a458798
|
fixed 403 redirect from logged out /admin
|
12 years ago |
|
psychobunny
|
98d42b0ade
|
moving social sharing parsing code from server side to client side & cleaned up templates
|
12 years ago |
|
Baris Soner Usakli
|
75850bd315
|
closes #772
|
12 years ago |
|
Julian Lam
|
c8a514aa37
|
updated new timeago path
|
12 years ago |
|
Julian Lam
|
bc407ee59c
|
fixing topic moving
|
12 years ago |
|
Julian Lam
|
a32aee60c2
|
reversing accidentally committed code to socket.io/index
|
12 years ago |
|
Julian Lam
|
0266c5516c
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
32470efb22
|
fixing upgrade script console.log and missing sessionData for topic moving
|
12 years ago |
|
Baris Soner Usakli
|
bbcc2312db
|
better redis info parser from node-redis
|
12 years ago |
|
Baris Soner Usakli
|
07085f1ff2
|
fixed sockettopics.post
|
12 years ago |
|
Baris Soner Usakli
|
0198024db0
|
parseInt uid
|
12 years ago |
|
Baris Soner Usakli
|
bc835f59d4
|
mongo getListRange fix
|
12 years ago |
|
Baris Soner Usakli
|
a97ee201d8
|
makes recent unread and category pages a lot faster, added logging when a user changes their username
|
12 years ago |
|
Baris Soner Usakli
|
c07bf466b2
|
added back search limiting
|
12 years ago |
|
Baris Soner Usakli
|
3475ed59c8
|
removed reds from install.js
|
12 years ago |
|
Baris Soner Usakli
|
93292e701d
|
added error check to setOnEmpty
|
12 years ago |
|
Julian Lam
|
97cc6cde67
|
closed #733 - after upgrade script, all users will be in a system "registered users" group
|
12 years ago |
|
Julian Lam
|
619fe74fc0
|
moved groups admin socket calls into admin file instead of standalone groups file
|
12 years ago |
|
Julian Lam
|
4453d055ea
|
linted socket/admin.js
|
12 years ago |
|
Julian Lam
|
aa689a7a29
|
fixed active users socket calls in ACP
|
12 years ago |
|
Julian Lam
|
3fb44d7693
|
who needs recursion, bitch?
- enhanced socket abs layer so that a method call of infinite depth is supported (theoretically).
|
12 years ago |
|
Julian Lam
|
5db9ff11d5
|
linting and adding missing require'd dep
|
12 years ago |
|
Julian Lam
|
e36f92b18e
|
closed #764
|
12 years ago |
|
Julian Lam
|
8d71098a0f
|
fixed detection for admin client-side scripts
|
12 years ago |
|
Julian Lam
|
3da96faa12
|
fixed email exists error... weird.
|
12 years ago |
|
Julian Lam
|
98e4257939
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
eb974ec1d8
|
fixing user register socket calls
|
12 years ago |
|
Baris Soner Usakli
|
30ad852492
|
closes #758
|
12 years ago |
|
Baris Soner Usakli
|
8bc0096b00
|
dont closed composer if callback isn't called
|
12 years ago |
|
Baris Soner Usakli
|
f73c81d6c3
|
closes #755
|
12 years ago |
|
Julian Lam
|
ee963e0c2a
|
moved reconnected socket call to SocketsMeta
|
12 years ago |
|
Julian Lam
|
73cbde4098
|
removed websockets.js wooo
|
12 years ago |
|
Julian Lam
|
a150691b5e
|
that's the last of it!! :D
|
12 years ago |
|
Julian Lam
|
a2329980c8
|
Merge remote-tracking branch 'origin/master' into socketAL
|
12 years ago |
|
Julian Lam
|
ea8aa3fff2
|
admin stuff, removed deprecated install templates, blah blah
|
12 years ago |
|
Julian Lam
|
c5d8a5a6b2
|
thread tools (phew!) -- sessionData is getting larger :P
|
12 years ago |
|
psychobunny
|
ef01717562
|
allow themes to set path to a frameworkCSS so you can include a customized BS or another framework altogether
|
12 years ago |
|
Julian Lam
|
8dd8412ae3
|
so far so good... user, meta, notifications, categories
|
12 years ago |
|
Julian Lam
|
dfa9f203e6
|
crashing a lot less now, heh
|
12 years ago |
|
Julian Lam
|
adb8f80b86
|
interim commit - removed calls to websockets.js, beginning porting to namespaced files
|
12 years ago |
|
psychobunny
|
1caaa8c20a
|
re-initialize translator when language is changed in ACP
|
12 years ago |
|
Julian Lam
|
c2a1cd94d0
|
addressing issue for #728 where existing NodeBBs don't have a defaultLang set
|
12 years ago |
|
Julian Lam
|
df4c6ca1c8
|
integrating client side translator into new languages tab in ACP
|
12 years ago |
|
Julian Lam
|
cd6af45afb
|
added icons to all h1s in admin panel
languages tab in ACP
each language now also has a "language.json"
|
12 years ago |
|
Julian Lam
|
119079ace5
|
added missing link, numRecentReplies, and class values to category.create... fixed #754, fixed #751
|
12 years ago |
|
Baris Soner Usakli
|
dda4586a2f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
dabd2f29af
|
closes #747
|
12 years ago |
|
Julian Lam
|
029b91a323
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
ac04e04016
|
fixed #719
|
12 years ago |
|
Baris Soner Usakli
|
3a6db04be5
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
eb65c5ad1b
|
reindex user name after change, #745
|
12 years ago |
|
Julian Lam
|
c2c1632c0e
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
2495b5b89b
|
refactored group category permissions, removed getCategoryAccess method call
|
12 years ago |
|
Baris Soner Usakli
|
176ac54cdf
|
closes #745
|
12 years ago |
|
Julian Lam
|
ab16b1184d
|
fixing issue where nojs mode of a private category would show the category topics, even if the requesting user was not allowed inside
|
12 years ago |
|
Baris Soner Usakli
|
0d26b21a2c
|
prevent double res.send/json if error occurs in profile image upload
|
12 years ago |
|
Baris Soner Usakli
|
a4ae9c70df
|
closes #742, closes #741
|
12 years ago |
|
Baris Soner Usakli
|
6f94acd0f2
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
8e6606fb5a
|
move post
|
12 years ago |
|
psychobunny
|
cfa4256df5
|
admin - download emails.csv, thanks to @akhoury for the gist
|
12 years ago |
|
Baris Soner Usakli
|
4912b8a893
|
fixed language regex
|
12 years ago |
|
Baris Soner Usakli
|
f75e55aa11
|
fixed path
|
12 years ago |
|
Baris Soner Usakli
|
d6333a3969
|
fixed plugin css files for relative path
|
12 years ago |
|
Baris Soner Usakli
|
faf5ea2122
|
check if we have edit permission on the pids that we want to move
|
12 years ago |
|
Baris Soner Usakli
|
291aa872c4
|
cant fork if not logged in
|
12 years ago |
|
Baris Soner Usakli
|
2e575bb2d8
|
closes #524
|
12 years ago |
|
psychobunny
|
6f120ff34a
|
closes #732, custom robots.txt
|
12 years ago |
|
Baris Soner Usakli
|
58580bd866
|
closes #716, also moved chat to its own template
|
12 years ago |
|
Baris Soner Usakli
|
be316ff602
|
fixed mongo listRemoveAll
|
12 years ago |
|
Baris Soner Usakli
|
dfc8aacbae
|
closes #735, removed create collection calls
|
12 years ago |
|
Baris Soner Usakli
|
8c04e8e56c
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
cd6750a38d
|
minor fix
|
12 years ago |
|
Julian Lam
|
71681b936f
|
fixed #731
|
12 years ago |
|
Julian Lam
|
4923c79496
|
tweaking upgrade script
|
12 years ago |
|
Julian Lam
|
3f0f5a09a0
|
new upgrade directive to re-slugify usernames again
|
12 years ago |
|
Baris Soner Usakli
|
e69611fa22
|
if email didnt change dont update and dont log
|
12 years ago |
|
Baris Soner Usakli
|
48074ea93b
|
redirect if category is accessed directly
|
12 years ago |
|
Julian Lam
|
f90beca449
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
724dcb88c0
|
added translator integration to emailer
|
12 years ago |
|
Baris Soner Usakli
|
0edb895c2c
|
indent
|
12 years ago |
|
Baris Soner Usakli
|
981719dee1
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
1466e68aa1
|
ssl support 101
|
12 years ago |
|
Julian Lam
|
f1412193ef
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
12 years ago |
|
Julian Lam
|
b6fdc5595d
|
removed handlebars dependency for emailer, using ANDREWBARS now
|
12 years ago |
|
Baris Soner Usakli
|
487281cc7a
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
12 years ago |
|
Baris Soner Usakli
|
751dc73ebe
|
fixes login/register and auth routes in relative path install
|
12 years ago |
|
psychobunny
|
7f8836daa4
|
simplified filter:server.create_routes - routes no longer require you to pass in req, res, name, route (the latter two was a mistake)
tl;dr - just content is all that is required. see
http://www.github.com/psychobunny/nodebb-plugin-static-page for more
info
|
12 years ago |