Josh Rickers
55b0270b34
Merge branch 'master' into admin-group-fix
11 years ago
Josh Rickers
bac1a5ec3e
updated groups to stop you from removing yourself from the admin group
11 years ago
Baris Soner Usakli
9400e5bcc9
motd
11 years ago
Baris Soner Usakli
f282dcd677
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Soner Usakli
55d4a5fe3a
template fixes closes #825
11 years ago
Julian Lam
affa51856b
closed #801 pending explanation
11 years ago
Aziz Khoury
f74f01ca77
Changed User.create signature to accept a hash, added a couple of utility functions as well
11 years ago
Baris Soner Usakli
5a069f1076
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Soner Usakli
84aa1ab527
motd string and class
11 years ago
Julian Lam
b6aa31b245
removed references to Reds user search
11 years ago
Julian Lam
07b286650c
adding cache buster to ACP, removing bootstrap css in ACP
11 years ago
Baris Soner Usakli
bbac361670
fixed crash if empty topic was loaded without ajaxify
11 years ago
Baris Soner Usakli
c00bd0b8d0
oops fixed
11 years ago
Baris Soner Usakli
22e1b0f22e
check result for null
11 years ago
Baris Soner Usakli
e6a9f5a704
error check
11 years ago
Julian Lam
962955f06a
fixed bug with search (getTopicsByTids became error-first)
11 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
11 years ago
Julian Lam
5e695d3222
fixed incorrect language string used in fb button in default motd
11 years ago
Julian Lam
45ce0566e7
added translation to default MOTD
11 years ago
Julian Lam
14b31cf4c8
hiding fork button on xs/sm devices (default motd)
11 years ago
Julian Lam
beec96416f
added translation to default MOTD
11 years ago
Julian Lam
253913f8d9
hiding fork button on xs/sm devices (default motd)
11 years ago
Baris Soner Usakli
ae76bb3928
lots of err first fixeS
11 years ago
Baris Soner Usakli
16aeb2d09d
added fb to motd default
11 years ago
Baris Soner Usakli
cd4cb240c8
upload file icon in composer was visible even when uploads were disabled
11 years ago
Baris Soner Usakli
265d1f6331
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Soner Usakli
dcf47f558e
limit search in db
11 years ago
psychobunny
8c5a458798
fixed 403 redirect from logged out /admin
11 years ago
Baris Soner Usakli
0198024db0
parseInt uid
11 years ago
Baris Soner Usakli
bc835f59d4
mongo getListRange fix
11 years ago
Baris Soner Usakli
c07bf466b2
added back search limiting
11 years ago
Julian Lam
adb8f80b86
interim commit - removed calls to websockets.js, beginning porting to namespaced files
11 years ago
Julian Lam
c2a1cd94d0
addressing issue for #728 where existing NodeBBs don't have a defaultLang set
11 years ago
Julian Lam
df4c6ca1c8
integrating client side translator into new languages tab in ACP
11 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"
11 years ago
Julian Lam
ac04e04016
fixed #719
11 years ago
Julian Lam
2495b5b89b
refactored group category permissions, removed getCategoryAccess method call
11 years ago
Baris Soner Usakli
0d26b21a2c
prevent double res.send/json if error occurs in profile image upload
11 years ago
psychobunny
cfa4256df5
admin - download emails.csv, thanks to @akhoury for the gist
11 years ago
Baris Soner Usakli
d6333a3969
fixed plugin css files for relative path
11 years ago
Baris Soner Usakli
58580bd866
closes #716 , also moved chat to its own template
11 years ago
Baris Soner Usakli
be316ff602
fixed mongo listRemoveAll
11 years ago
Baris Soner Usakli
48074ea93b
redirect if category is accessed directly
11 years ago
Baris Soner Usakli
1466e68aa1
ssl support 101
11 years ago
Baris Soner Usakli
751dc73ebe
fixes login/register and auth routes in relative path install
11 years ago
Julian Lam
0ac9ec6001
Merge remote-tracking branch 'origin/master' into email-revamp
11 years ago
psychobunny
98a646fa62
changed numRecentTopics to numRecentReplies, that makes more sense now
11 years ago
psychobunny
1d69436b44
fix to getRecentReplies causing count = 0 to return unlimited
11 years ago
psychobunny
d6c7551120
pull # of recent replies based on settings
11 years ago
Julian Lam
24944762d7
fixing 'back to nodebb' ext, and revamping email confirm logic
11 years ago
Julian Lam
d6e0625fc8
Merge remote-tracking branch 'origin/master' into email-revamp
11 years ago
psychobunny
2c398f81d2
fixed the twitter link to @NodeBB
11 years ago
cmastudios
e3185b9560
Calculate age based on days instead of years
...
Calculating the age based on the year only caused issues in the display of the age because it was off. Example: Person who was born in march of 1999 is displayed as 15 instead of 14 after the turn of the year.
11 years ago
Julian Lam
339ed4e47b
implemented emailer for welcome email (though the email confirmation system is horribly broken)
11 years ago
Julian Lam
3ff550914f
Merge remote-tracking branch 'origin/master' into email-revamp
...
Conflicts:
package.json
11 years ago
Baris Soner Usakli
d43f3cebc6
closes #707 , closes #686
11 years ago
Baris Soner Usakli
8cfb239aac
closes #705
11 years ago
Baris Soner Usakli
40d20846d8
moar refactor
11 years ago
Baris Soner Usakli
6c30437c47
closes #706 , refactor admin image uploads, fixed gif uploads
11 years ago
Julian Lam
e4e57ce31f
initial commit to emailer system overhaul
11 years ago
Baris Soner Usakli
be3465c5ca
display events in admin page events section
11 years ago
Baris Soner Usakli
2c489c600c
closes #675
11 years ago
Julian Lam
8385ceef79
topics in private categories can no longer be accessed via ajaxify or by
...
direct link
11 years ago
Baris Soner Usakli
cab6ab8e17
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Soner Usakli
e9fbed71ae
closes #613 , fixed allowRegistration incase its undefined
11 years ago
Julian Lam
b4121f262d
removing serializeUser console.log -- how long has this ben here? haha
11 years ago
Baris Soner Usakli
f68f02d346
closes #679
11 years ago
Baris Soner Usakli
680dbf138a
closes #669
11 years ago
Baris Soner Usakli
3a00c177d3
closes #150
11 years ago
Baris Soner Usakli
8bfea656c4
Merge branch 'master' of https://github.com/akhoury/NodeBB into akhoury-master
11 years ago
Baris Soner Usakli
8655c2d2a6
removed console.log
11 years ago
Baris Usakli
da9c673ec4
closes #651
11 years ago
root
35ad3be969
Adding support for restricting category read access based on user groups
11 years ago
psychobunny
a2c9867902
plugins - woops, wrong namespace for admin api calls
11 years ago
psychobunny
58a3f33200
plugins - added api routes to filter:admin.create_routes
11 years ago
psychobunny
25bac03bab
fixed facebook + gplus authentication - callbackURL was invalid
11 years ago
Baris Soner Usakli
770cea9329
added more error first to some functions
11 years ago
Baris Soner Usakli
27a01f6c61
closes #657
11 years ago
psychobunny
9d88b9eed3
default motd now shows @NodeBB, and not @dcplabs
11 years ago
akhoury
b89cf6f480
Merge remote-tracking branch 'upstream/master'
11 years ago
psychobunny
4397da144f
fixes crash introduced @1021615848e49da3434f00cfdb6fb79ab5990b47
11 years ago
psychobunny
cf8f0ca225
cleanup
11 years ago
akhoury
114294e24a
allowGuestSearching config .. second attempt
11 years ago
Julian Lam
e67af67180
fixing derped plugin css files due to cache buster
11 years ago
Julian Lam
c313c4501b
pushNotifCount method for real-time updating of notification bell + favicon for multiple tabs ( closes #219 )
11 years ago
Baris Usakli
401a30e02c
fixed categories.getRecentReplies so it only returns count posts instead of getting 10, posts are added and removed from sorted set when they are deleted restored
11 years ago
Baris Usakli
9816272b7b
if there are more than 50 results only return 50, issue #648
11 years ago
psychobunny
a3734f2e15
completed custom favicon upload, closes #643
11 years ago
psychobunny
1b843fba9c
added admin route to upload favicon
11 years ago
psychobunny
e76936abfc
added ability to upload category images. closes #638 , closes #532
11 years ago
psychobunny
f6f7959d28
convert profile images to static png if setting is checked in control panel, closes #562
11 years ago
psychobunny
090bc2ad10
403 all guests on /search & /search/term regardless of mobile/desktop - closes #612
11 years ago
Baris Soner Usakli
76636b64db
small fixes
11 years ago
Baris Soner Usakli
be6ed43223
removed the setName from sorted sets and stored them with _key like everything else
11 years ago
Baris Usakli
2b7e4cbdf4
moved tests from debug to tests folder
11 years ago
Baris Soner Usakli
097810a057
parseInt fixes getObjects fix
11 years ago
Baris Soner Usakli
3a7fcc2d3d
search in mongo
11 years ago
Baris Soner Usakli
53ca7a1143
added search functions to database files, removed reds from nodebb moved it to redis
11 years ago
Baris Soner Usakli
1564e3d530
tons of fixes to mongo and redis, to make returns the same
11 years ago
Baris Usakli
806a454b05
fixing notifications.prune
11 years ago
Baris Usakli
705754e823
merged master
11 years ago
Baris Usakli
519d376071
added mongo info function, change admin redis template to database template
11 years ago
Julian Lam
d9ee9bf5e3
revamped handling of unread messages, so that a socket call is made to all socket clients whenever a new unread message is available. Prior behaviour had the unread count updated via ajax call on ajaxify (which was clumsy at best and didn't update automagically)
11 years ago
Baris Usakli
67d5ea83e7
replace . with \uff0e in mongo
11 years ago
Baris Usakli
7875138c08
added parseInt
11 years ago
Baris Usakli
c096656eff
merged master fixed conflicts
11 years ago
Baris Soner Usakli
39b70a9e09
derp
11 years ago
Baris Soner Usakli
9b557cafd8
better sets in mongo, should change sorted sets too using sort
11 years ago
Baris Soner Usakli
7c4347736c
added index on _key
11 years ago
Baris Soner Usakli
72a3ab1d6c
derp
11 years ago
Baris Soner Usakli
2e2938616d
more mongo and redis stuff
11 years ago
Baris Soner Usakli
53a7eab3e8
removed couple RDB.multis
11 years ago
Julian Lam
d27f2eb214
fixed #604
11 years ago
Baris Soner Usakli
4b5988c269
isSetMember returns true or false
11 years ago
Baris Soner Usakli
0471a192ab
more mongo stuff
11 years ago
Baris Soner Usakli
ca01fb9f7d
added key methods to mongo
11 years ago
Baris Soner Usakli
113cb85c46
added lists to mongo
11 years ago
Baris Soner Usakli
21bbe68c97
added sortedSetRemove to mongo
11 years ago
Baris Soner Usakli
28c75e09a9
can haz sorted sets?
11 years ago
Baris Soner Usakli
cb6c42ea44
user stuff
11 years ago
Baris Soner Usakli
610d45bb32
completed hashes in mongodb I hope :)
11 years ago
Baris Soner Usakli
66bc4184d8
deleteObjectField, isObjectField in mongo
11 years ago
Baris Soner Usakli
b024d10185
implemented getObjectValues in mongo
11 years ago
Baris Usakli
10474f8e2a
more mongo work
11 years ago
psychobunny
1f970c3bdb
incorrect url was being passed for callback - twitter and g+
11 years ago
Baris Soner Usakli
6d79521922
moved connect-redis to the redis.db file, expose the sessionStore from redis.js db file, do the same for mongo db with mongo-connect
11 years ago
Baris Soner Usakli
95db5f93cb
remvoed console.logs
11 years ago
Baris Soner Usakli
b900bc9cce
more fixes
11 years ago
Baris Soner Usakli
32d5118266
tons more changes
11 years ago
Baris Usakli
190948336a
closes #590
11 years ago
Dan Rowe
94fdeb2378
Missed one lcasing
...
Also anyone else nervous about arbitrary hook execution here?
11 years ago
Baris Soner Usakli
cdbca7d262
more cleanup in routes/user.js
11 years ago
Baris Soner Usakli
140f90f7f3
cleaned up requires
11 years ago
Baris Soner Usakli
c5f9f896b2
make all admin routes only accesible to admins
11 years ago
Julian Lam
684839f04a
Merge branch 'master' of github.com:designcreateplay/NodeBB
11 years ago
Julian Lam
0188ea9a3b
setting cache headers to 0 on development mode
11 years ago
Baris Usakli
a87ebb64d8
clean up of posts and some template additions
11 years ago
Julian Lam
38da65ee58
tweaks to category permission modal
11 years ago
Julian Lam
e3e1a556cd
groups pruning method
11 years ago
psychobunny
b7aea63c53
create auth routes only after plugin system is enabled and auth.init hook is fired
11 years ago
psychobunny
c16f04bbcf
plugins - filter:admin.header.build (pre-existing hook) now allows you to add menu items to the social authentication panel as well
11 years ago
psychobunny
51b38c4c55
plugins - added filter:auth.init hook to add additional login strategies; fixed callbackURL
11 years ago
psychobunny
89c5d01efa
modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
11 years ago
Julian Lam
f0e8633dcc
category whitelisting for posting messages, isAdmin now error-first
11 years ago
Julian Lam
5ee5c8179a
category whitelist for replying to posts, lots of refactoring, too
11 years ago
Julian Lam
4d2469b4ce
tweaks to whitelist (interim commit)
11 years ago
Julian Lam
4e2326fc84
Merge remote-tracking branch 'origin' into category-whitelisting
11 years ago
Baris Usakli
e1f6e064a9
removed io from user.js, figure out why notifications are breaking when websockets.js is required from it
11 years ago
Baris Usakli
541993c80a
fontawesome 4 migration, closes #473
11 years ago
Baris Soner Usakli
390937a20b
added err to getAllTopics
11 years ago
Baris Soner Usakli
48835d8c44
used ELSE in template
11 years ago
Baris Soner Usakli
23eb7824ac
closes #513
11 years ago
Baris Usakli
83f18c1915
closes #526
11 years ago
Julian Lam
08ef67e824
closed #536
11 years ago
Julian Lam
a7216caa3b
closed #518
11 years ago
Julian Lam
87309601ce
closed #533
11 years ago
Julian Lam
2cf55dcf9f
added action:page.load hook
11 years ago
Baris Usakli
0b922d3f60
possible fix for #516
11 years ago
Baris Usakli
586a181e0a
closes #507
11 years ago
Baris Usakli
8c4f776122
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Usakli
84fa704b25
refactor abit adding error checking to missing parts
11 years ago
Julian Lam
18009ebb39
interim commit
11 years ago
Baris Soner Usakli
88154c3ebf
closes #497
11 years ago
Baris Usakli
fa9636a62a
closes #495
11 years ago
Julian Lam
37497fc5a0
fixed #393 - refactored basic route handling, moved some other routes to debug routes
11 years ago
Julian Lam
885eec79c3
ninjafix for bad conditional
11 years ago
Julian Lam
aa1994be67
updated MOTD to not be inside a jumbotron, updated default styling of MOTD
11 years ago
Baris Soner Usakli
2a8a62a253
remove console.log
11 years ago
psychobunny
1d6135150f
multiple plugins pointing to admin can conflict - fix
11 years ago
Julian Lam
4353a9da25
issue #478 - hot-swapping of plugins
11 years ago
Baris Soner Usakli
9b7c9e4a81
camel case for user.js methods
11 years ago
Julian Lam
1fb09a9c8c
merging @deniswolf's new tests, and double-checking that generateUUID still works
11 years ago
Julian Lam
aecbe6d316
interim commit, still nothing done
11 years ago
Baris Usakli
468688615f
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Usakli
f4faee4283
moved image uploading to a require js module, added image upload to site logo
11 years ago
Julian Lam
705571de8c
notifications page + ajaxify route + css styling
11 years ago
Baris Usakli
d789e96d79
fixed 2 missing requires in api.js
11 years ago
Baris Usakli
41cf7c6814
added commas after some requires, added missing plugins require to categories
11 years ago
psychobunny
32990794ce
fixed admin bug (on f5 was not populating fields); plugins - filter:admin.create_routes allows you to create path to custom admin page
11 years ago
psychobunny
2b07917020
plugins - filter:admin.header.build allows you to add plugins to navigation in ACP
11 years ago
Baris Usakli
4e59b85073
recent page, for hour, day, week, month
11 years ago
Julian Lam
bd1e95b655
cleaned up admin template mapping
11 years ago
Julian Lam
0b299b2fe7
Merge pull request #381 from adarqui/express-logger-0.0.7
...
Express & Socket.io logger
11 years ago
Baris Usakli
1155eaf1f1
online page changes
11 years ago
Julian Lam
0414ec7f83
removing testbed code from repo (why was it even checked in?!!)
11 years ago
Andrew Darqui
55d84d0f9b
basic logger functionality added - accessible via http://nodebb/admin/logger
11 years ago
psychobunny
22c73f3c12
closes #345
11 years ago
Baris Soner Usakli
06f59cf853
closes #310
11 years ago
Baris Usakli
f2c1a92513
closes #215
11 years ago
Baris Usakli
585e5cd88f
closes #341
11 years ago
Baris Usakli
eb1c1c78d4
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
11 years ago
Baris Usakli
0b0d64b52e
logout/login changes, updateHeader changes
11 years ago
Julian Lam
1ae51ef5ea
redis export function (commented out for now)
11 years ago
Julian Lam
c80e2552b2
express-namespaceing routes
11 years ago
Julian Lam
99440585e6
Merge branch 'master' into optimize-22-09-2013
...
Conflicts:
package.json
11 years ago
Baris Usakli
bae9f46d8b
small fixes to search
11 years ago
Baris Usakli
776b51fef7
closes #323
11 years ago
Julian Lam
043aafd7b7
closed #315
11 years ago
Julian Lam
5f00f1e18e
renamed "toHTML" method to "parse"
11 years ago
Baris Soner Usakli
de34c7580f
closes #314
11 years ago
Baris Soner Usakli
6be5bcc4c8
closes #308
12 years ago
Baris Usakli
efef9c864c
closes #306
12 years ago
Baris Usakli
27cb837b08
closes #303
12 years ago
Baris Usakli
f9442db96f
closes #284
12 years ago
Baris Usakli
24e4be77d8
closes #304
12 years ago
Julian Lam
c69e30c146
Merge branch 'master' of github.com:designcreateplay/NodeBB
12 years ago
psychobunny
64b071f277
nconf and redis wrapper no longer global objects. jshinted app.js. updated sockets.io to latest
12 years ago
Julian Lam
af246ad0d7
Merge remote-tracking branch 'origin'
12 years ago
Julian Lam
56a87329ec
removing extra line
12 years ago
psychobunny
1780b343b4
formatting - routes
12 years ago
Julian Lam
79280b195e
changed get_uid_by_userslug to be error-first
12 years ago
Julian Lam
4a18728e19
closed #297
12 years ago
Julian Lam
95b16690e0
altering api route to use next() instead of echoing 404...
12 years ago
Julian Lam
f6b865a052
closed #292
12 years ago
Julian Lam
71bdd4608b
removed defunct installation routes
12 years ago
Baris Usakli
bb14881b63
change getUserData to return err
12 years ago
Baris Usakli
9845df4d1b
another fix to path in image upload
12 years ago
Baris Usakli
a1c9685b49
fixed image upload, delete temp file if there is error
12 years ago
Julian Lam
bec0b46a2c
refactoring installation scripts to use node prompt module, lots of other fixes
...
fixed #263 , fixed #264 , fixed #265
12 years ago
Baris Soner Usakli
1f60578a63
closes #261
12 years ago
Julian Lam
03fb649274
Merge branch 'master' into user_groups
12 years ago
Julian Lam
02a02fa64c
updated getTopicWithPosts to use a start and end option, and fixed issue with RSS feed saving (issue #256 )
12 years ago
Julian Lam
85ac4aac94
group creation and deletion
12 years ago
psychobunny
3773f6b44f
merge conflicts + updated search.tpl to BS3
12 years ago
psychobunny
bb8f75b4be
merged.. conflicted up the ass. registration looks gud again
12 years ago
Baris Soner Usakli
0db599a478
closes #205
12 years ago
Baris Soner Usakli
cc55073107
issue #224
12 years ago
Julian Lam
0243e9c5be
issue #214 , preparing for addition of post.parse hook by renaming markdownToHTML to just "toHTML", and making it asynchronous.
12 years ago
psychobunny
f251b9c6c5
Merge branch 'master' into bootstrap3
12 years ago
psychobunny
fe89f1f096
added a .hidden-mobile class for inline block elements. also removed button text on jumbotron for mobile devices
12 years ago
Baris Soner Usakli
eff1b174c0
closes #198
12 years ago
Julian Lam
9bc12f28b4
fuck git
12 years ago
psychobunny
df15dceaef
merging master to pull baris' latest fixes
12 years ago
psychobunny
9f2e192993
jumbotron updates. I'll come back to fixing the button layout on mobile later
12 years ago
Baris Usakli
c647793512
meta config changes, refactors
12 years ago
psychobunny
a008cf971d
register and login -> BS3
12 years ago
psychobunny
2f70dd732d
BS3 basic integration; btn-large to btn-lg (inc FA); navbar fixed
12 years ago
psychobunny
746fa93c80
added API call for total unread topics; moved unread notification parsing to client side
...
also fixed a bug where the new notification icon glow would disappear on
page refresh even if there were existing notifications.
12 years ago
psychobunny
eded61d66e
typo
12 years ago
psychobunny
d9360da9a5
default motd: removed version number and button text on mobile layouts
12 years ago
Baris Usakli
1e66116e1d
closes #181
12 years ago
Baris Soner Usakli
7860cfdec3
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
12 years ago
Baris Soner Usakli
30bbea9c74
closes #175
12 years ago
Baris Usakli
c70c67394a
closes #171
12 years ago
Baris Soner Usakli
6690f49c4e
added profile views to users, little cleanup to use app.addCommasToNumbers
12 years ago
Baris Soner Usakli
ff805a704d
closes #175
12 years ago
Baris Soner Usakli
999e98e43d
add label to banned users, dont hide their posts
12 years ago
Baris Usakli
74af205426
banned users cant login, show error messages on failed logins
12 years ago
Baris Usakli
929282a2f7
ban users, closes #125 , banning a user hides all posts topics of a user and their profile page becomes inaccessible
12 years ago
Baris Usakli
91446378bd
require winston
12 years ago