hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,346 Commits
2 Branches
0 Tags
158 MiB
Commit Graph

5442 Commits (fa9fde43fb1e3d9a67000b7f69261d8eb150f3d5)

Author SHA1 Message Date
Julian Lam 3e3fff9fe8 hooking up accept/reject invite,
Julian Lam 03e39f7b9b isInvited mechanic for
psychobunny 13fa1f6b9a require socket.io only when you need it, shaves off another 0.5s on load
psychobunny 61b8fd2402 woops, left in some debug statements
psychobunny dee5d18439 require npm module only as needed - shaves off a full second of loading time yay
Barış Soner Uşaklı 66d6c49ed4 closes
Julian Lam 8262c38ac8 upgrading privilege sets to be system groups, so they're not in the way
Julian Lam 4984f2f449 Merge branch 'master' of github.com:nodebb/NodeBB
Barış Soner Uşaklı 14888a96cb Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/upgrade.js
Barış Soner Uşaklı 55884220b4 upgrade plugins:active to zset
Julian Lam d3ff6a9f47 hidden groups are invisible to non-members,
psychobunny 44c6375d91 it's on line 24 now
psychobunny f63ecac8ee upgrade script for nodebb-rewards-essentials
Barış Soner Uşaklı 89f2520eba fix user link pic
Barış Soner Uşaklı e6e755dd46
Barış Soner Uşaklı 1d5e15eab4 closes
Julian Lam 8b81f3d835 server-side support for hidden option in group admin,
Julian Lam 218ecce6c1 accessing search route with no term auto-expands the form now, part 1 of 2,
barisusakli 56d18666d6 closes
psychobunny cb7c318377 closes
psychobunny f5eaa08340 fixed complications with deleted id's
psychobunny def57d2926 don't rely on client side to increment id (duh)
psychobunny 7a8d84c011 ability to add a claimability limit to rewards
psychobunny bb35950a5a rewards acp - ability to set amount of times a user can claim reward
Barış Soner Uşaklı 61b1251a73 removed sort methods
psychobunny 5a6457ec7c adding rewards-essentials to core
psychobunny fe83adcbae prevent rewards from clobbering each other on save
psychobunny b26bf9f22d rewards: bug fixes and cleanup, pretty much done part 1 ;)
psychobunny 2ba1363e12 results.owner*
psychobunny aa38d6dda2 rewards bug fixes
psychobunny 7e9095b21b added "owner" to action:post.upvote/downvote/unvote
Barış Soner Uşaklı f9581e435d getGroupsData method and filter:groups.get
psychobunny 949fcbbf11 rewards: big feature sprint
psychobunny 54c5034ce0 moved rewards/conditions/conditoinals out of core into rewards-essentials
psychobunny a7c3d193cc include nodebb-rewards namespace
psychobunny 7fa61f03e2 saving conditions
psychobunny 1998f102d6 using tjs to load new lines instead of cloning
psychobunny 8373f7359e don't error out if reward not filled
psychobunny 09086f7d30 deleting rewards
psychobunny c844400ab9 cleanup and fix for adding new rewards
psychobunny 5f54de3b37 successfully got loading and saving of rewards working
psychobunny e5115c0cf2 differentiate between rid and id
psychobunny 67b693cd3a pass in expected format of active rewards
psychobunny cd26f5d06d passing in values for saving rewards
psychobunny 91c02d4e29 ditching rewardID in favour of verbose id's
psychobunny 46e0fad2d8 rewards: code organization, getting ready to code saving/loading of active rewards
psychobunny 2cc6f0c507 fixed disable logic
psychobunny 4acf8cafee rewards: adding new rows
Julian Lam 88aa427669 updated upgrade script so that it does not rely on Groups.list, as the method has changed between v0.5.0 and v0.6.0. 
Also added setImmediate call so eachLimit doesn't explode
psychobunny 3ca11c1947 rewards: disable / delete
psychobunny 4145046e02 rewards: got everything loading
psychobunny b1c37775c5 more styling
barisusakli 756d03fa62 closes 
generate paths on retrieval instead of notification creation
also fix follow notification path
psychobunny 7457b22427 added more api fields to rewards
psychobunny 9291ec64f9 styling
psychobunny 4f53bd59be rewards - got custom inputs loading
psychobunny 94c1c2d547 fixed loading mock data
Julian Lam ceb18fe73d added new hook and method for plugins to introduce their own formatting options,
Barış Soner Uşaklı 767816e669
Barış Soner Uşaklı c1ce0a9e1d closes
psychobunny 2bebac964e loading mock data
Barış Soner Uşaklı 743cd20441 closes
Julian Lam 4ba6d44858 Merge pull request from yariplus/mobifix 
Fix  ACP navbar on mobile.
psychobunny 0e7c3be9d3 made some progress with mock api + acp
psychobunny bdcf090aaa init rewards system
Barış Soner Uşaklı da305210e2 closes
Barış Soner Uşaklı 97c0b130ca closes
Julian Lam 350acde379 ability to mark a notification read/unread from dropdown list, made styling less bootstrap-locked, using FA icon in theme instead of hardcoded in template
Barış Soner Uşaklı 8eb45fc80a dont remove self from browsing
Barış Soner Uşaklı d09fcbaef0 closes
yariplus 145f7b3809 Fix ACP navbar on mobile.
Barış Soner Uşaklı 957a0840b1 Merge pull request from pitaj/master 
Fix ACP sidebar affix issue
barisusakli aa94dafac1 closes
Julian Lam 6a69fcd4cd fixes
Julian Lam 502e806f88 fixed -- group creation now using language keys, and no longer succeeds if a group by the name of 'guest' is created.
Peter Jaszkowiak 1ce0073cb6 Fixed events sidebar positioning
Peter Jaszkowiak a2f4cda715 Fixed sidebar positioning
Barış Soner Uşaklı dca143fd87 Merge pull request from acardinale/master 
Add hooks "filter:topic.build" and "filter:category.build"
acardinale 6607dfc4c9 Update categories.js
acardinale 8975a0962e Update topics.js
barisusakli d577371a51 fix test
barisusakli 0dca86f255 fix tests
barisusakli 3bcd8aefb0 deleteObjectFields method 
cleaned up user reset
psychobunny 540facaaab try (I give up, grunt-watch seems so unpredictable... on windows anyways)
barisusakli fbcc7c4bc3 closes
barisusakli c305cd8220 removed commented out code
barisusakli 0096d74cfa user password reset test
barisusakli 150d33eb92 upgrade script to rename widgets:home.tpl to widgets:categories.tpl
Julian Lam df7c48c474 restoring latest plugin version in plugins ACP
Julian Lam 7bb9ea4b33 querying via qs now
Barış Soner Uşaklı 276cd51836 closes
psychobunny 0611b7e1ea closes
Barış Soner Uşaklı bd553eb05d closes
barisusakli d152254bcb removed availableTemplates assign
barisusakli b2fc4d5dc4
barisusakli c450992882 closes
Julian Lam 1029b6c2f3 some prep for
Barış Soner Uşaklı d09a53197e closes
Barış Soner Uşaklı 09b26bc950 if code isnt validated return error
Barış Soner Uşaklı 8cbb9aa310
Barış Soner Uşaklı 0d84486187 closes
Barış Soner Uşaklı 429d7cbfa2 added filter:category.get
psychobunny f4c587c530 move hardcoded initial welcome text into welcome.md
Barış Soner Uşaklı 0421b6ef06 closes
Barış Soner Uşaklı cdd5847b39 closes
barisusakli f99c3a310d use uid instead of socket.uid
barisusakli 5dfafff421 call callback on password update
psychobunny e60ef6c9d1 Merge pull request from pitaj/master 
Translate ACP pages
Peter Jaszkowiak 2b9d1ee3dd Translate ACP pages 
I fixed it
psychobunny d016a9f3b0 Merge pull request from pitaj/master 
Make ACP sidebar fixed
Barış Soner Uşaklı 3f31098144 closes
Barış Soner Uşaklı 3293436867 closes
Barış Soner Uşaklı d20628a8d4 closes
Barış Soner Uşaklı f3d1e96c24 filter deleted topics on popular
Barış Soner Uşaklı 749ce5f8e5 dont crash if callback isnt supplied to list methods
Julian Lam 081462983a refactored the groups update method a bit, and now if a group has pending members and it becomes a public group, those users become members
Peter Jaszkowiak 8241243f6b Make ACP sidebar fixed 
If you want to implement some kind of replacement for the CSS calc I
used, go ahead and do it yourself. I'm hoping webmasters can either deal
with a tad bit of overlap or have a modern browser.
barisusakli 1142f7700f closes
barisusakli a5029d148c open user links in new tab
Barış Soner Uşaklı 2c86ca59e6 fire filter:serch.build if query is empty
Barış Soner Uşaklı 6a55cdfbaf fix relative_path image url for sub installs
Barış Soner Uşaklı 57d6bb3b4c filter:search.build hook
Barış Soner Uşaklı 34c1d69ed3 added filter:tags.search
Julian Lam f16c37eeaf
barisusakli b6125b1674 toString pid
barisusakli 5e7bf7a272 default search in posts
Barış Soner Uşaklı c98720ee4c show results as WIP
Julian Lam c351261165 added daily cleaning of reset tokens
Julian Lam 1843d0364e closed
barisusakli 7f6518e4a6 private plugin link fix
acardinale 612acc41ba Add hook "filter:category.build" 
Same behavior as "filter:register.build"
acardinale a63c679935 Add hook "filter:topic.build" 
Same behavior as "filter:register.build"
barisusakli 10928ed11b escape post content
barisusakli b41119a374 show seconds like search page
barisusakli 4d63a7c020 closes ##2705
barisusakli 5cc728994b dont need hidePostedBy
barisusakli d96e4ec22a fix category filter and pagination, strip marquee
barisusakli eff1256dfb search sort, search in posts, titles, posts& titles
Julian Lam 957415463f Merge branch '0.7.0' 
Conflicts:
	package.json
	src/search.js
barisusakli 8bbd7d971b fix index to post if sorting is by votes and pagination is used
barisusakli 9062a8f02b pass on mainPid
barisusakli c859586269 calculate topic post indices instead of querying db
Julian Lam ff5eeb3a85 fixed
barisusakli 38dd3d4281 search newer/older than and better pagination
barisusakli 722b629572 closes
Barış Soner Uşaklı 6680c2d475 Merge pull request from TheBronx/master 
new filter hooks on favourite actions
barisusakli ba6af71150 fix profile update
barisusakli 652e247d1b fix username change event log
barisusakli 92c869e886 try to get ip from x-forwarded-for first
barisusakli d3aa353d73 dont crash if html is not string
barisusakli 9bca777320 closes allowGroupCreation setting
barisusakli 149120a186 fix notif url in topic notification email
barisusakli 832430ed37 dont crash if post.user or post.category doesn't exist
barisusakli 5c0bcd7e5d proper qs, pagination on search results
barisusakli 161b934827 reply count filter atleast/atmost
barisusakli def600e927 search in categories and children
Julian Lam f7ccdc3668 Merge branch 'master' of github.com:NodeBB/NodeBB
Julian Lam fdaccc804c handling cases where no callback is passed to emailer.send
barisusakli 57ebcb8b8a closes
barisusakli 39a75ea2d7 fix recent replies
barisusakli 385760bdda
barisusakli 2911de0af9 really fix tests
barisusakli cba9ad3d60 fix tests, and groups.join duh
barisusakli 16537bc636 prevent double callback
barisusakli 311fd00ecd dont allow guests to join groups
barisusakli b7602c6e80 removed winston.err
barisusakli fd773807e9 fix copy paste fail 😦
barisusakli 25ccc573c0 closes
barisusakli 255f50343c closes
barisusakli 28c57b6635 removed unused requires
barisusakli cc2ab12f29 removed bans from downvotes and flags 
cleanup thread tools emits
Julian Lam b3278cf8e8 fixed
barisusakli 6a837632fa fix first post loading when pagination is enabled
Julian Lam cfcfc8e0b1 Revert "fixed #2681" 
This reverts commit a46aaf2c87.
Julian Lam a46aaf2c87 fixed
barisusakli 2c8e8a1f1c closes , closes
Julian Lam 904daf7776 Merge branch 'master' into 0.7.0
Julian Lam c652d1b80e removed console log from upgrade script
barisusakli feeeb83a43 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 4d9e7fce22 notifyOnlineUsers helper
barisusakli f988959989 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 7363c71180 sitemap style
Barış Soner Uşaklı 63fd3f259f Merge pull request from MegaGM/Fix-User.setUserField/s 
Uploading avatar causes crash on 0.6.1-dev
barisusakli dc0229fc73 closes
Mega 2e1d1ac665 Uploading avatar causes crash on 0.6.1-dev
barisusakli 15b5c56612 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 2c033bf286 set memberCount to 0 on creation
barisusakli b3a968e006 merge
barisusakli dc2a2aa98e store group member count in group hash 
yet another upgrade script
Julian Lam ecfa8f7a7d passing memberCount and createTime into getUserGroups
Julian Lam e4e9020e1f added groups page to user profile
Julian Lam da0b2c84e6 passing memberCount and createTime into getUserGroups
Julian Lam 4a7ec3ccc6 added groups page to user profile
psychobunny 4f5918390a if user search is blank, return all users
barisusakli 2512598917 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 3bb9c9531f catch errors from static hook
Julian Lam 77a9c7c195 Merge branch 'master' into 0.7.0
Julian Lam 939e623547 collapsing a bunch of whitespace using async.apply, and also fixed as well
barisusakli 39cac43b96 if key isn't found dont error 
Conflicts:
	src/database/redis/main.js
barisusakli f3f3ca8e50 if key isn't found dont error
Julian Lam a7a4edfd37 administrators group no longer shows up in group searches
barisusakli d1a1cada19 fix typo
barisusakli 530bdbbd1a dont rename if key doesn't exist
barisusakli b54f2de504 pass uid to getUsers and getUsersFromSets
barisusakli 4413c70d3c Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 57453f33ab new group members route 
getMembers can take start end
ability to specify how many group members to return
barisusakli e16cfa396b Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli a1c8902b4e hook fixes 
new hook, action:user.online,
fix action:user.set hooks so they pass in uid
check err before firing hooks
barisusakli aaa1fae558 closes
barisusakli f9fecf4bc1 faster sort users
barisusakli 60fecdbdf8 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 0fab6c243c increase rate limit timeframe from 1 second to 10 seconds
barisusakli c87c99eadd dont check admin emits against flooding
barisusakli ed714cdf77 user search paginator
barisusakli 98ff75b9c3 closes
Julian Lam aabfeba38d Merge branch 'master' into 0.7.0 
Conflicts:
	src/user.js
barisusakli 9db7f0f9a0 doing on master as well
psychobunny d47cd270df some random favourite typo
barisusakli ab69477b24 moved filter:user,get to central function
psychobunny c06132e779 Merge remote-tracking branch 'origin/master' into 0.7.0
psychobunny f253b11d71 passed in wrong object
psychobunny 0828caab32 renamed to filter:userlist.get
psychobunny 943e268ffc add filter:users.get
barisusakli ddee93beab Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 27518716a0 make getUsers public for plugins
Julian Lam 891731ca52 enabled saving of sendPostNotification setting
Julian Lam 08e39d150e fixed
Julian Lam 06238f6894 partial fix to
barisusakli c33b369858 closes
barisusakli 20a2262e43 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli bf9b633d50 fix Group.exists if an array is passed in
barisusakli 26defd7dca Groups.getGroupNameByGroupSlug
barisusakli e31bf9131f added topics.follow and toggleFollow
Julian Lam 5a1c2b9ddf booleanifying sendPostNotification user setting when requested, and now only sending the post notification if the user has flipped that option on in user settings... kind of an important thing to forget...
barisusakli 835ad3ea53 fix post.getUpvoters to work with an array
Julian Lam bc9ede7b6c changed emailer.send so that it processes a callback, if provided. Also added new option to receive emails every time a topic you subscribe to is posted to.
barisusakli 90b1b13914 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 4b3aa26abd closes
barisusakli 19814a619d Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli caec718092 callback for getUidsInRoom
psychobunny 3fb7eb766b closes
Julian Lam ca92372676 fixed
barisusakli 535f30aa9e Merge remote-tracking branch 'origin/master' into 0.7.0
Julian Lam 70f6c396fc updated widget container to use h3 in panel header
barisusakli bd8a77a22b dont crash if callback isnt passed in
barisusakli 2c45dc6450 redis helpers
Julian Lam 0bf98b5494 simplified isOwner check because there's no need to check admin status as admins automatically become owners now
Julian Lam 070215b05e simplified isOwner check because there's no need to check admin status as admins automatically become owners now
Julian Lam 4c927060d9 Merge branch 'master' into 0.7.0
Julian Lam 0c2d2a28ba admins can bypass the request step of a group and just join it, and they also become owners when they join a group
Julian Lam 72f28b7b38 closed
barisusakli d895ca6827 missing semicolon
barisusakli 5fb8817b3c closes
Julian Lam d2217b8137 closed
barisusakli 740c52fc4f missing semicolon
barisusakli 22c541d95f closes
barisusakli d40646ac42 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli f3719df997 getGroups method to get a range
Julian Lam c8c7081f5d Merge branch 'master' into 0.7.0
Julian Lam 3ade5da00f groups sorting by creation date
barisusakli afe29d3133 Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 25f6b816ed send iso and unix timestamp
barisusakli 274523266f Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli c379753341 upgrade scripts 
upgrade groups to sorted set(groups:createtime) upgrade
upgrade groups:<name>:members to sorted set
new database methods
tests
Julian Lam 4a3255d4fd search sorting
Julian Lam be30dcc2d0 Merge branch 'master' into 0.7.0 
Conflicts:
	public/src/client/groups/list.js
Julian Lam 2a6de59277 if group search is executed with empty string, return all groups
Julian Lam fd8a885145 fixed tests by removing the broken one, heh heh heh
Julian Lam 78a5843ae4 fixed tests by removing the broken one, heh heh heh
Julian Lam d4779c8c0a Merge branch 'master' into 0.7.0
Julian Lam 6502dd2561 group searching
Julian Lam fa27461abc upgrading administrator groups as well
barisusakli dd38ee96fa return cover:url in user groups
barisusakli f8a03c4fca Merge remote-tracking branch 'origin/master' into 0.7.0
Julian Lam 22a619d9c7 fixed
barisusakli ea3d7d610a Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli 7efc0619cc dont crash if data.username is undefined, dont set username to empty value
barisusakli f1a3815ddc action:user.updateProfile
barisusakli aab2bc0b39 keep track of the last 20 events
Julian Lam c4bc51b834 fixing installation script that broke with recent updates to groups
barisusakli 21522e59c4 added slug to user group return
barisusakli 96c27d29f4 dont crash if callback isn't supplied
barisusakli 2f955c3af4 getUpvoters works with array
Julian Lam d2938ea509 closed
barisusakli d96a1f0365 closes
Julian Lam 5160ab1ed1 closed
barisusakli 4c62590bc8 closes
barisusakli ad21e73491 send values to plugins when updating groups
Julian Lam eb5b8ccec3 better check for group exist, groups with different cases can no longer be created,
barisusakli 9f8b274e24 filter:group.get
barisusakli 94fa212eab added filter:groups.get
Julian Lam c026a64e8e adding concept of group slugs, . ping @barisusakli for downstream plugin changes
barisusakli 6f140384e0 send groupData on action:group.create
Julian Lam 491e0060d4 more files that should be loaded for maintenanceMode to work
Julian Lam fe45fc967d updating maintenance mode middleware so js doesn't crash until login client-side js is ready
barisusakli f5b448c300 closes
barisusakli e46cda835a closes
TheBronx 0bd48ef023 fix error in previous commit 
fix error in previous commit
TheBronx e3cf528b57 pass also user id on fireHook 
pass also user id on fireHook as suggested by @barisusakli
TheBronx 6ccb35576c new filter hooks on favourite actions 
before a favourite action is made, fire a filter hook so plugins can
modify or cancel that action before it takes place.
barisusakli 03ae7db561 on user delete remove from ip sorted set, fix search by ip
barisusakli 0741f00e4f Merge remote-tracking branch 'origin/master' into 0.7.0
barisusakli f67053df52 figure out pathname, dont crash if callback isnt supplied
Julian Lam 04be40158c if you attempt to join a group when you're already in a group, you can't anymore.
Julian Lam 8ba05c08fe category privilege rescinding
Julian Lam 577a646adc this should appease @barisusakli
barisusakli 236fe91e95 fix typo
barisusakli 6fe8d25166 add uid to filter:topic.get
barisusakli 3eb922393f closes
Julian Lam 8d23265324 sending in groupObj data into group.delete hook
Julian Lam d4d99cba7c fixes
Julian Lam 36cfbbbc58 Merge branch 'master' of github.com:nodebb/NodeBB
barisusakli c324d71727 closes
Julian Lam fa87d883dc allowing "hidden" to be passed directly to Groups.create
barisusakli 3e666adfea action:plugin.install and uninstall
Julian Lam d813bda883 update, create, destroy hooks,
Julian Lam 5c6dfb7462 missed one, @EisFrei
Julian Lam cfdd4ec164 Revert "missed one, ping @EisFrei" 
This reverts commit 2ed6b78cc5.
Julian Lam 2ed6b78cc5 missed one, ping @EisFrei
Julian Lam 666cef4029 updated hooks action:groups.join, action:groups.leave, and action:groups.requestMembership to match other action hooks in group namespace (that's "group", not "groups"), ping @EisFrei
Julian Lam 36a49cd994 guests can no longer attempt to join a group,
barisusakli cd99324286 closes , closes
barisusakli 8f5bf1a7ed closes
Julian Lam 188c667580 closed
barisusakli d9a7547e63 next(err)
barisusakli 468d2be668 added error checks and missing returns to widgets closes
Julian Lam 86a6979606 added comments to explain the voting logic
Julian Lam 87b9a60610 fixed group renaming, ping @schamper
Julian Lam 7289d50e6c whoops, fixing travis and groups
Julian Lam fc75e3258d closed
Julian Lam d02f7e0e42
Julian Lam 6ac04e9da7 closed
Julian Lam aeafbe6170 better widget representation on smaller screens
barisusakli e414008c59 closes
barisusakli fd2edcaf6f closes
Julian Lam a8c818c6cd added new hook, filter:controllers.topic.get
barisusakli 1adc3b4ea7 removed console.log
barisusakli 6ccdf187ea closes
barisusakli f6525a13c8 data will be always inside socket.io/ modules
barisusakli 2a66aad078 ability to add extra fields to user data, new hook filter:user.addFields
Julian Lam 50ac813388 Merge branch 'private-groups', closed
barisusakli c2fab07236 replaces fs.exists with try catch
barisusakli 5f12679426
Julian Lam 698f598a30 default cover photo for groups,
Julian Lam 675968f0f3 cover photo for groups,
barisusakli 02dbce57fb relative path fix missing ;
barisusakli 05894d14c6 closes
barisusakli 456b844e61 closes
barisusakli 08c1dad3ee topics.isFollowing works with multiple tids now
barisusakli f417e07b9d user search changes