barisusakli
|
22ba104930
|
chat style
|
11 years ago |
Julian Lam
|
31606578f5
|
putting cache buster back in header template arguments
|
11 years ago |
barisusakli
|
0c744a947e
|
chat will use timeago
|
11 years ago |
Julian Lam
|
17dd113a94
|
fixed issue where plugin css and js wasn't loaded -- also less files no longer blow up
|
11 years ago |
Julian Lam
|
c2f6717e88
|
adding cache-buster to template globals
|
11 years ago |
Julian Lam
|
8c7b474e8b
|
moved fontawesome CSS into stylesheet.css, and updating the js and css middlewares to compile at app start, not on first load
|
11 years ago |
barisusakli
|
980cf2ccf9
|
closes #1184
|
11 years ago |
Julian Lam
|
6fb69e6c19
|
removing error output for incorrect pw on login
|
11 years ago |
Barış Soner Uşaklı
|
9f5893bc83
|
Update delete.js
|
11 years ago |
barisusakli
|
0741b162cb
|
#1265
|
11 years ago |
barisusakli
|
f247c2195e
|
fixed user picture in og:image
|
11 years ago |
barisusakli
|
94a589e0e4
|
#1190
|
11 years ago |
barisusakli
|
bcc464a196
|
fixed reverse loading of topics
data.after can be zero which was causing a invalid data error
|
11 years ago |
barisusakli
|
a3404d3d4f
|
closes #1253
|
11 years ago |
barisusakli
|
36dc086470
|
no need to get signature and custom profile info
|
11 years ago |
Julian Lam
|
fdc6b004c5
|
closed #1260, closed #1261
|
11 years ago |
barisusakli
|
04e0c58b84
|
fixes realtime update of home
|
11 years ago |
Ian Forsey
|
28f186d4a7
|
Fix syntax error
|
11 years ago |
barisusakli
|
1f2d5abbb7
|
possible fix for #1256
|
11 years ago |
Ian Forsey
|
6ca5a42936
|
Allow absolute config paths
|
11 years ago |
barisusakli
|
0cfd05d839
|
closes #1254
|
11 years ago |
barisusakli
|
ca0dbf84be
|
no need for exists check
if topic doesnt exist topicData will be null
|
11 years ago |
barisusakli
|
a695c6134b
|
added missing meta
|
11 years ago |
barisusakli
|
db3632557e
|
moved notification push out of markAsRead
|
11 years ago |
barisusakli
|
7a1037dc11
|
moved posts and recent to new files
|
11 years ago |
barisusakli
|
38733ef94b
|
moved reply post create to topics/create.js
|
11 years ago |
barisusakli
|
478429af3a
|
moved fork to new file
|
11 years ago |
barisusakli
|
bac3cf03cb
|
moved unread to new file
|
11 years ago |
barisusakli
|
ec63ba4b17
|
removed unused method
|
11 years ago |
barisusakli
|
8b6f701246
|
removd dupe
|
11 years ago |
barisusakli
|
7f193041a8
|
removed admin topics
|
11 years ago |
barisusakli
|
880c393b6d
|
fixed admin groups page
changed gid to groupName
|
11 years ago |
Julian Lam
|
6f78d29498
|
upgrade script should not delete non-hidden groups
|
11 years ago |
Julian Lam
|
1e3b9b7cf6
|
removing console logs
|
11 years ago |
Julian Lam
|
d33253bc3a
|
Merge remote-tracking branch 'origin/master'
|
11 years ago |
Julian Lam
|
96d58288c9
|
tweaking upgrade script so it works with a real db
|
11 years ago |
Julian Lam
|
4701eb1cee
|
updating groups so that members leave a group when it is deleted
|
11 years ago |
Julian Lam
|
ce867aec53
|
updated upgrade script date
|
11 years ago |
Julian Lam
|
0e44eb8629
|
final refactoring pass for groups -- #1252
|
11 years ago |
barisusakli
|
26d67257fe
|
moved privilege check out of getRecentReplies
it was being called twice in api/home
|
11 years ago |
barisusakli
|
ef0740049a
|
dont return everything in followers, #1250
|
11 years ago |
barisusakli
|
b2a837d283
|
getPostSummary change
|
11 years ago |
barisusakli
|
301008b9cb
|
missed this one
|
11 years ago |
Julian Lam
|
7b4f596aba
|
updating all group lib methods, and their callers -- #1252
|
11 years ago |
barisusakli
|
c7c3bc1c8e
|
no need to create empty array
|
11 years ago |
barisusakli
|
fa98da6978
|
related to #1250
|
11 years ago |
Julian Lam
|
befaa56ad0
|
derp derp derp more refactoring of groups
|
11 years ago |
Julian Lam
|
c893effcb9
|
WIP commit -- groups refactoring + upgrade scripts
|
11 years ago |
barisusakli
|
2f8ecc00d8
|
closes #1250
|
11 years ago |
Julian Lam
|
85a5c123af
|
minor tweak to winston logging for user jobs
|
11 years ago |
psychobunny
|
3bd93a40fc
|
closes #1235
|
11 years ago |
Julian Lam
|
c709b7ed5b
|
Merge remote-tracking branch 'origin/master'
|
11 years ago |
Julian Lam
|
4239c376c8
|
truncating user list in Groups ACP page, resolved #1132. Refactored system groups handling
|
11 years ago |
Julian Lam
|
3c5fc72e20
|
adding "system" flag to system groups
|
11 years ago |
barisusakli
|
567d867b1e
|
fixed require to missing public config.json
|
11 years ago |
Julian Lam
|
ab5ec68f2f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
da1a1d5930
|
adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login)
|
11 years ago |
barisusakli
|
e86eb8667e
|
threadTools jshint
|
11 years ago |
Julian Lam
|
cc0fabc619
|
removing console logs from upgrade script
|
11 years ago |
barisusakli
|
7d382b2900
|
closes #1243
|
11 years ago |
barisusakli
|
0f66e80a5a
|
added setting to disable notification sounds
|
11 years ago |
Julian Lam
|
98745ae0c4
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
2b8a7c73ac
|
daily digest emails! resolved #326
|
11 years ago |
barisusakli
|
64676b66c8
|
removed unused validator require
|
11 years ago |
barisusakli
|
6774f0f52f
|
fit image to 128x128 and keep aspect ratio, closes #1240
|
11 years ago |
barisusakli
|
6a4dd5cc05
|
closes #1160
|
11 years ago |
barisusakli
|
e11efad0b7
|
added getSortedSetRangeByScore
|
11 years ago |
Julian Lam
|
2badb76fc2
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
61afee98c3
|
updates to new settings mechanism, updating markdown minver, minor linting for upgrades.js, and upgrade stmt for markdown migration
|
11 years ago |
barisusakli
|
e67e9aee42
|
moved user creation to new file
|
11 years ago |
barisusakli
|
f83b7ee972
|
renamed event
|
11 years ago |
barisusakli
|
8efc33d6a1
|
closes #976
|
11 years ago |
barisusakli
|
10d8eed7b9
|
closes #1229
|
11 years ago |
psychobunny
|
f0a19b06c2
|
launch aesthetics
|
11 years ago |
psychobunny
|
c6a89b504f
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
psychobunny
|
6262312747
|
closes #1153
|
11 years ago |
Julian Lam
|
012480c2e1
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
43e0c726fa
|
relaxed isClientScript regex, fixed #1198
|
11 years ago |
barisusakli
|
e49d445422
|
added err checking
|
11 years ago |
psychobunny
|
da7d6a3137
|
closes #1175
|
11 years ago |
barisusakli
|
76d8f19e73
|
forgot to return #963
|
11 years ago |
barisusakli
|
cd4a204f99
|
closes #963
|
11 years ago |
psychobunny
|
197b34461f
|
potentially fixes #1228
|
11 years ago |
psychobunny
|
6e64712fd3
|
fixed bug in api/search causing it to crash if term is not passed in via ajaxify, see #1195
|
11 years ago |
psychobunny
|
941c3b2d7e
|
added emitter class; express.listen only after background tasks complete; closes #1227
|
11 years ago |
Julian Lam
|
16f1db4f5d
|
fireEvent reflection socket call, tweaks to Sounds page in ACP
|
11 years ago |
Julian Lam
|
14a0b45ae8
|
securing settings.save socket listeners behind admin namespace
|
11 years ago |
Julian Lam
|
c1ccc81400
|
ACP integration for Sounds
|
11 years ago |
Julian Lam
|
17903adace
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
barisusakli
|
46a475fdde
|
controllers/admin/users cleanup
|
11 years ago |
barisusakli
|
ea4931fa1d
|
removed dupe from controllers/user.js
|
11 years ago |
barisusakli
|
19c2a85bf1
|
logger jshint
|
11 years ago |
barisusakli
|
37e8856861
|
new middleware to add slug to topic and category
|
11 years ago |
barisusakli
|
1eafc6ba3d
|
moved user delete to its own file, closes #746
|
11 years ago |
Julian Lam
|
f942c03a58
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
barisusakli
|
611c16b5a6
|
closes #1126
|
11 years ago |
barisusakli
|
7873b90caf
|
missing ;
|
11 years ago |
barisusakli
|
3d6cce44c7
|
dont display chats with deleted users
|
11 years ago |
barisusakli
|
42f42adfaf
|
clean up, radix
|
11 years ago |
barisusakli
|
1354739d19
|
user deletion #746
user deletion NOT SKALABLE
|
11 years ago |
Julian Lam
|
ebe61450a1
|
WIP - settings.prepare refactoring... because.
|
11 years ago |
Julian Lam
|
6d03f713c5
|
"Sounds" tab in Settings page... WIP, needs fixing.
|
11 years ago |
barisusakli
|
a0e784a612
|
closes #1138
|
11 years ago |
barisusakli
|
6011399063
|
removed comment
|
11 years ago |
barisusakli
|
d2bef79888
|
closes #1194
|
11 years ago |
Julian Lam
|
401bd02748
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
553cabdcfa
|
refactored sound system so that they can be specified in ACP, updated soundfile to work in FF, which fixes #1209
|
11 years ago |
barisusakli
|
bddc270033
|
changed addUserInfoToPost to add a user object
|
11 years ago |
barisusakli
|
e0911c1fff
|
replaced exists check with getCategoryData
|
11 years ago |
psychobunny
|
9223865c80
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
psychobunny
|
9de21995c4
|
added category bgColor and color to topics api
|
11 years ago |
barisusakli
|
175230e337
|
closes #1205
|
11 years ago |
psychobunny
|
e3df487173
|
cleanup
|
11 years ago |
psychobunny
|
79bacfe164
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
psychobunny
|
6563a72b5b
|
fixed emailer templates
|
11 years ago |
barisusakli
|
d8e00f95a2
|
moved user search to its own file
|
11 years ago |
barisusakli
|
383b68e7fc
|
user js refactor
|
11 years ago |
barisusakli
|
cc0ac29b36
|
categories refactor
|
11 years ago |
barisusakli
|
90e398e5c9
|
user js refactor, category fix
if a category that didn't exist was request with category/1231 or
api/category/1231 it was crashing.
|
11 years ago |
Julian Lam
|
67ef155c60
|
fixing image uploads
|
11 years ago |
barisusakli
|
3f5c51174d
|
refactored user.js
took out notifications, email and reset code to separate files
|
11 years ago |
psychobunny
|
f47f146320
|
moved out uploads and users from controllers/admin into their own files
|
11 years ago |
psychobunny
|
641ec3ef82
|
moved duplicate upload validation code into its own fn
|
11 years ago |
psychobunny
|
0bbff06cfa
|
use middleware.authenticate instead of checking in each fn
|
11 years ago |
psychobunny
|
01cda60704
|
moved admin upload functions into controllers/admin; re-organized routes/admin to look like routes/index; removed unused deps
|
11 years ago |
Julian Lam
|
4da1a2da97
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
1e0ec5dd47
|
appending relative path to user images for subfolder installs
|
11 years ago |
psychobunny
|
8e4c23149c
|
more re-organization of routes/index.js
|
11 years ago |
barisusakli
|
2220483915
|
notifications
|
11 years ago |
Julian Lam
|
5647354421
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
ca2e9d7d9e
|
linting and moving xregexp back to .js
|
11 years ago |
psychobunny
|
bff722925f
|
Merge pull request #1206 from BitBangersCode/plugin-templates-fix
Fix importing of templates served by plugins
|
11 years ago |
MrWaffle
|
c1a580c51d
|
Fix importing of templates served by plugins
|
11 years ago |
Julian Lam
|
816d9e5d12
|
minifying xregext lib
|
11 years ago |
barisusakli
|
7b409c095c
|
mongo callback refactor
|
11 years ago |
barisusakli
|
4f72513f19
|
removed keys
|
11 years ago |
barisusakli
|
6eff7d4c51
|
mongo cleanup
|
11 years ago |
barisusakli
|
a0222b69bb
|
closes #1200
|
11 years ago |
barisusakli
|
e9ab9dcce2
|
search cleanup
|
11 years ago |
barisusakli
|
33e34ca864
|
change getRecentPosts to take count
|
11 years ago |
Julian Lam
|
caa9c17bc2
|
fixed login routes on subfolder installs
|
11 years ago |
Julian Lam
|
9bf1d345e2
|
adding relative path to a category image for subfolder installs
|
11 years ago |
barisusakli
|
6e6c5688d9
|
more cleanup
|
11 years ago |
barisusakli
|
2befa06a33
|
some cleanup to socket posts
|
11 years ago |
barisusakli
|
92267de9d8
|
feeds
|
11 years ago |
barisusakli
|
3a42200e24
|
refactored feeds
|
11 years ago |
Julian Lam
|
bf8f91f0d9
|
'less bad' handling of background image in home.tpl
|
11 years ago |
Julian Lam
|
82a3415ab1
|
fixing admin routes on subfolder installs
|
11 years ago |
Julian Lam
|
f28c690f2f
|
fixing up robots.txt
|
11 years ago |
Julian Lam
|
08b2106e0f
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
7111adb3c2
|
fixed subfolder installs again (a bit), also stopped apple-touch-icon from clobbering /apple-touch-icon
|
11 years ago |
barisusakli
|
d4556d4da3
|
added minifed js files
replace jquery form and timeago with minified versions
|
11 years ago |
barisusakli
|
813b3d6fcc
|
changes for live streaming of posts
|
11 years ago |
psychobunny
|
5dc5eb41df
|
fixed ajaxify bug introduced in last commit
|
11 years ago |
psychobunny
|
e451a145dd
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
psychobunny
|
c8bf617f4b
|
allow plugins to override any route (except for admin routes)
|
11 years ago |
Julian Lam
|
41116bc0b2
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
4bb6d89e83
|
fixed #1172
|
11 years ago |
Julian Lam
|
b259c3d422
|
categoryData should return better topics (non-anon uid passed in now)
|
11 years ago |
Julian Lam
|
82a82afe99
|
updated the way privileges were handled in the .get() category controller
|
11 years ago |
barisusakli
|
350070339b
|
added home room emit
|
11 years ago |
barisusakli
|
a5f4135c62
|
added socket listeners to home
|
11 years ago |
psychobunny
|
5abc96399e
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
psychobunny
|
5f7f5a37c1
|
linting
|
11 years ago |
barisusakli
|
76037a5f14
|
closes #1191
added a new method called isSetMembers takes in an array of values to
test if they are members of a set
|
11 years ago |
Julian Lam
|
21d28b0f58
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
de6f58842b
|
fixed issue where events page would error out if log was not already created.
|
11 years ago |
barisusakli
|
88c4b90fc8
|
accounts controller removed duplication
|
11 years ago |
barisusakli
|
037e8943a8
|
removed left over
|
11 years ago |
barisusakli
|
9564b6fda2
|
closes #1165
|
11 years ago |
barisusakli
|
3d68c7c6b6
|
added getObjectsFields methods to db class, changed getUsers methods to use the new method, refactor to user.js and mongo.js
|
11 years ago |
Julian Lam
|
8873963946
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
ffa42ffea3
|
moving pluginRoutes to top of route stack (like others), put app.load hook behind plugins' ready callback
|
11 years ago |
barisusakli
|
c41ef10572
|
removed routes/user.js
|
11 years ago |
barisusakli
|
4e3819603b
|
jshint fixed missing var
|
11 years ago |
barisusakli
|
e83ad1ab4a
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
barisusakli
|
974333dbc3
|
fixed missing currentPage
|
11 years ago |
Julian Lam
|
efb933f102
|
backwards-compatibility for plugins if they return a callback
|
11 years ago |
Julian Lam
|
19c9f1bb19
|
backwards compatibility with plugins that are assuming no callback
|
11 years ago |
Julian Lam
|
a7f310b49a
|
fixed #1189
|
11 years ago |
psychobunny
|
2cde4508b0
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
psychobunny
|
23983c4c80
|
cleanup - search routes
|
11 years ago |
barisusakli
|
71f84655ca
|
minor cleanup
|
11 years ago |
barisusakli
|
b413f06b72
|
removed unused function from groups, jshint
|
11 years ago |
psychobunny
|
30cfddda68
|
fix for topics view count, and marking topics as unread
|
11 years ago |
barisusakli
|
16d2e65ea0
|
optimized getCategories
|
11 years ago |
psychobunny
|
6ea4d89edc
|
fixed search routes
|
11 years ago |
psychobunny
|
4e54d500c0
|
fix bug where inactive plugin templates were being compiled as well
|
11 years ago |
psychobunny
|
4793b6b4f9
|
fixed invalid path for apple-touch-icon
|
11 years ago |
psychobunny
|
a99be8e7be
|
got rid of all the res.locals.isAPI checks in all controller methods. now 1000% cleaner :shipit:
|
11 years ago |
psychobunny
|
faf3de7e27
|
added a check for res.locals.isAPI inside res.render, instead of doing it all over the place in code
|
11 years ago |
psychobunny
|
1b3f089804
|
fixed /admin/index 404
|
11 years ago |
psychobunny
|
6acdc66470
|
fixed bug if default templates folder missing (in case you planned on building an entire theme from scratch)
|
11 years ago |
psychobunny
|
464c2f42c3
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/admin/themes.tpl
src/meta.js
src/routes/api.js
|
11 years ago |
psychobunny
|
37840d35f0
|
missing variable - numCSS
|
11 years ago |
barisusakli
|
73c89010cb
|
closes #1182
|
11 years ago |
barisusakli
|
57f9f8bc57
|
closes #1176
|
11 years ago |
psychobunny
|
1ef95bd09e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
app.js
public/templates/category.tpl
public/templates/popular.tpl
public/templates/recent.tpl
public/templates/unread.tpl
src/routes/plugins.js
src/webserver.js
|
11 years ago |
barisusakli
|
6496b91c29
|
closes #1180
|
11 years ago |
barisusakli
|
ec86aafb48
|
return user object
|
11 years ago |
barisusakli
|
b4b9ed1841
|
optimized getTopicsByTids, single db call to get topicData, added cache for privilege/category/user data
|
11 years ago |
barisusakli
|
1568c50906
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
barisusakli
|
23e1cc010c
|
removed removeHiddenFields function, using mongo selector instead
|
11 years ago |
Julian Lam
|
f00f7c8818
|
fixed apple-touch-icon for subfolder installs
|
11 years ago |
Julian Lam
|
d9d04a3982
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
5a8a3627d2
|
bringing subfolder installations to v0.4.0 - JUST FOR @PLANNER
|
11 years ago |
barisusakli
|
284276cbb6
|
messaging jshint
|
11 years ago |
psychobunny
|
e84dd4fd94
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/accountedit.tpl
public/templates/header.tpl
src/routes/meta.js
src/webserver.js
|
11 years ago |
Julian Lam
|
c9642cecd2
|
setting Lavender as default theme for 0.4.0, woo!
|
11 years ago |
Julian Lam
|
90b29031fe
|
backwards compatibility with older plugins using css with staticDir
|
11 years ago |
Julian Lam
|
552a63367d
|
workaround for problem arising from switch to Date.UTC()
|
11 years ago |
Julian Lam
|
5880590425
|
removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.
fixes #1168
|
11 years ago |
psychobunny
|
23e4eb7cd9
|
deprecating filter:server.create_routes and filter:admin.create_routes; maintains limited functionality but recommended you migrate asap
|
11 years ago |
Julian Lam
|
1f23642ab4
|
Merge branch 'master' of github.com:designcreateplay/NodeBB
|
11 years ago |
Julian Lam
|
b2bc1d4555
|
setting password to null in getUserData, because Object.delete is bad? :P (thanks @barisusakli)
|
11 years ago |
Julian Lam
|
e9e53ad95e
|
added a new property to userData "hasPassword", disabling "current password" field in user editing if no password is set (for SSO logins, for example)
|
11 years ago |
Baris Soner Usakli
|
d34e68ca25
|
convert score to int in mongo
|
11 years ago |
Baris Soner Usakli
|
da0e1a8eb9
|
added back err to redis flushdb
|
11 years ago |
Baris Soner Usakli
|
4986c8ed3a
|
fixed tests
|
11 years ago |
psychobunny
|
8c8055fbae
|
fix for multiple synchronous hooks (synchronous hooks to be deprecated in 0.4x)
|
11 years ago |
psychobunny
|
178edd150a
|
moved action:app.load out of webserver; passing in app, mdw, and controllers into action:app.load. now we can create routes dynamically ;)
|
11 years ago |
psychobunny
|
a9cccc9b9c
|
allow hooks to accept single/multiple arguments instead of requiring you to send in a hash
|
11 years ago |
psychobunny
|
a9046b926d
|
clean templates directory before beginning compilation
|
11 years ago |
psychobunny
|
90a80ad83d
|
plugins can now define a templates directory which gets compiled onload without requiring any hooks
|
11 years ago |
psychobunny
|
c054ae121b
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
Julian Lam
|
4a1513eabf
|
fixed #1161 properly - Merge remote-tracking branch 'origin/master'
Conflicts:
src/upgrade.js
|
11 years ago |
Anthony Webb
|
6f8ed7f073
|
err doesnt exist here
|
11 years ago |
psychobunny
|
f20a2a2047
|
merging changes from deprecated routes/user.js
|
11 years ago |
psychobunny
|
8a05eee1f5
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/user.js
|
11 years ago |
Baris Soner Usakli
|
096f352c82
|
closes #1130
|
11 years ago |
Julian Lam
|
e956c19587
|
#1110 - moved isEmailAvailable into User.email
|
11 years ago |
Julian Lam
|
e0dcf95138
|
fixed missing err in upgrade script
|
11 years ago |
Baris Soner Usakli
|
38145abae1
|
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
|
11 years ago |
Baris Soner Usakli
|
58cb51bb02
|
removed unused imagemagick require
|
11 years ago |
Julian Lam
|
b404b0197f
|
final pass, resolved #1155
|
11 years ago |
Julian Lam
|
5f52ef5f01
|
removed all 0.3.x related upgrade scripts, and updated minSchemaDate
|
11 years ago |
Julian Lam
|
64aa89f5ee
|
updating upgrade script to use UTC timestamps *facepalm*. God, I hope I didn't break anything...
(first pass #1155)
|
11 years ago |
psychobunny
|
34552f7fb0
|
added middleware.guestSearchingAllowed to the actual search API call
|
11 years ago |
psychobunny
|
542f937589
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/api.js
|
11 years ago |
psychobunny
|
b9e119241e
|
moved get_custom_templates into plugins.js
|
11 years ago |
psychobunny
|
8f7a7fec7d
|
more cleanup; commenting out custom plugin routes until its fixed properly
|
11 years ago |
psychobunny
|
c0cd6148f4
|
one final push, cleanup + organize + lint; made feeds/meta/plugins routes follow same pattern as other route files
|
11 years ago |
Baris Soner Usakli
|
c028761857
|
new route to get recent posts
|
11 years ago |
psychobunny
|
1dbc47b890
|
deps cleanup
|
11 years ago |
psychobunny
|
73d637096c
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
public/templates/account.tpl
public/templates/accountposts.tpl
public/templates/favourites.tpl
public/templates/search.tpl
|
11 years ago |
psychobunny
|
3efca794fd
|
regex cleanup; fixed indenting on partials
|
11 years ago |
Baris Soner Usakli
|
c9c25bd174
|
added getRecentPost
|
11 years ago |
psychobunny
|
67517c58e3
|
added warning if partial template was not found
|
11 years ago |
psychobunny
|
d442e10037
|
template compilation + partials support
|
11 years ago |
Baris Soner Usakli
|
976744480f
|
post summary change
|
11 years ago |
psychobunny
|
552eb78db8
|
template compiling init; changing themes now finally works on this branch
|
11 years ago |
psychobunny
|
d471ea2d5b
|
app.create_route removed
|
11 years ago |
psychobunny
|
da331a1e6b
|
clean up in routes/admin.js
|
11 years ago |
psychobunny
|
1dc63caf77
|
using views_dir config
|
11 years ago |
psychobunny
|
a3a0aabd22
|
return error if template doesn't exist
|
11 years ago |
psychobunny
|
10f4fa004e
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
psychobunny
|
48df0cf889
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
Conflicts:
src/routes/admin.js
|
11 years ago |
Baris Soner Usakli
|
b28e4846a4
|
fixed disconnect check
|
11 years ago |
Baris Soner Usakli
|
4b64b9dcdc
|
closes #951
|
11 years ago |
psychobunny
|
c24c2a5422
|
search and reset routes, the very last of the views to be refactored :shipit:
|
11 years ago |
psychobunny
|
8802fc5a33
|
fixing link tags; misc bug fixes
|
11 years ago |
psychobunny
|
d3aead7c13
|
changing renderHeader function signature to req, res, next
|
11 years ago |
psychobunny
|
48b9289002
|
use the proper footer for admin
|
11 years ago |
psychobunny
|
7ef6f9bbf5
|
buckled down and refactored pretty much all of admin routes x_x
|
11 years ago |
Julian Lam
|
8846f7fb9b
|
fixing mappedPath in windows
|
11 years ago |
Baris Soner Usakli
|
37aeda14c4
|
fixed email retrieval in mongo
|
11 years ago |
Baris Soner Usakli
|
be70b3de57
|
closes #1090
|
11 years ago |
psychobunny
|
d360320441
|
finally got admin header and footer working 👍
|
11 years ago |
psychobunny
|
eed97648b1
|
started moving admin mdw into middleware/admin.js; res.render post-processing to append admin footer/header
|
11 years ago |
psychobunny
|
e588762aa0
|
yes, I've finally started on the dreaded admin refactor (not much else left to do :/)
|
11 years ago |
psychobunny
|
209bcaba8c
|
middleware.updateLastOnlineTime; middleware.prepareAPI (reinstated)
|
11 years ago |
psychobunny
|
f785f7f6e3
|
added deprecation notice to plugins/fireHook
|
11 years ago |
psychobunny
|
94aeb3ab22
|
notifications route; added middleware.authenticate to user/uploadpicture api route
|
11 years ago |
psychobunny
|
5b8e8e4b67
|
deprecating use of templates.setGlobal on server side in favour of passing in api.config into res.locals (still needs work)
|
11 years ago |
psychobunny
|
188aeabba8
|
missed a file in previous commit
|
11 years ago |
psychobunny
|
7bef58deb1
|
started moving out api functionality out of the route file into controllers/api.js
|
11 years ago |
psychobunny
|
138b12e815
|
re-added linkTags into header; clean up
|
11 years ago |
psychobunny
|
d18ce28de0
|
fixxed categories.get; privileges object and currentPage were missing on original route
|
11 years ago |
psychobunny
|
c5066ed100
|
Merge remote-tracking branch 'origin/master' into webserver.js-refactor
|
11 years ago |
Julian Lam
|
30e83fdabe
|
fixing upgrade script if order is not set
|
11 years ago |
psychobunny
|
31d576e9ed
|
deprecation notice
|
11 years ago |
psychobunny
|
fe9d4efa98
|
moved api-only routes into routes/api.js, cleanup & linting
|
11 years ago |
psychobunny
|
d75bc9578b
|
deprecating middleware.prepareAPI in favour of using app.all('*') in /api namespace
|
11 years ago |
psychobunny
|
88ca3733a7
|
more jshinting
|
11 years ago |
psychobunny
|
d20501b29d
|
meta.js merge conflict
|
11 years ago |
psychobunny
|
cdf92c5cda
|
fixed a really annoying bug - the original topics route pre-refactor never actually included a privileges object
|
11 years ago |
Julian Lam
|
fc53385ede
|
removing socket.io library from minfile
|
11 years ago |
psychobunny
|
fa2b5d1ee6
|
re-implementing meta and link tags - completified
|
11 years ago |
psychobunny
|
3eb9f65c2e
|
jshinting controllers/index.js; adding back meta tags to home page
|
11 years ago |
psychobunny
|
8df33e65ac
|
fixing bug in topics causing meta tags to revert on subsequent refresh
|
11 years ago |
Julian Lam
|
1837a8443c
|
shifting socket.io back to the end :\
|
11 years ago |
Julian Lam
|
a8d2b46911
|
fixed incorrect path in plugin script inclusion
|
11 years ago |
Julian Lam
|
e70bc9f163
|
added deprecation warning for plugins using filter:scripts.get
|
11 years ago |
Julian Lam
|
5553e07bbd
|
moving socket.IO client lib to top of file, just in case
|
11 years ago |
Julian Lam
|
4c2a6953f1
|
concatenating the client scripts, instead of compressing, in development mode
|
11 years ago |
psychobunny
|
dbbbe21883
|
re-implementing meta and link tags part 1
|
11 years ago |
psychobunny
|
6820e9e662
|
random jshinting expedition
|
11 years ago |
psychobunny
|
f0dfee5402
|
clean up
|
11 years ago |
psychobunny
|
6c3c669e31
|
moved middleware out of webserver.js and into middleware.js
|
11 years ago |
psychobunny
|
936e52a43f
|
require db
|
11 years ago |