Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-17 13:02:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,149 Commits 68 Branches 489 Tags
76376f52c3eaed9141dfd75627d012f4bb856e67
Commit Graph

14149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Lam
76376f52c3 Merge remote-tracking branch 'origin/master' into develop 2017-01-19 14:29:12 -05:00
Julian Lam
3d25c3e1c6 Merge pull request #5380 from pitaj/master 
Fix wrapper breaking when no attrs need replaced
 2017-01-19 14:17:39 -05:00
Peter Jaszkowiak
97fe86c916 Fix wrapper breaking when no attrs need replaced 2017-01-19 12:13:23 -07:00
psychobunny
19c3f54a30 Merge pull request #5379 from pichalite/issue-5344 
Fixes #5344
 2017-01-18 16:38:48 -05:00
pichalite
7b234c666f Fixes #5344 2017-01-18 20:32:19 +00:00
barisusakli
ef72762ba7 use groups.isMemberOfGroups 2017-01-18 20:24:48 +03:00
Barış Soner Uşaklı
bcd2b5cc50 Merge pull request #5376 from pichalite/post_create 
Send isMain to post.save filters
 2017-01-17 21:55:29 +02:00
Julian Lam
08af924873 closes #5189 2017-01-17 14:05:33 -05:00
Julian Lam
82e9e1a05d closes #5189 2017-01-17 14:05:19 -05:00
pichalite
9176f7e037 Only send isMain to hook instead of saving to post hash 2017-01-17 18:24:16 +00:00
Julian Lam
48909e753c Merge branch 'master' into develop 2017-01-17 10:46:14 -05:00
Julian Lam
06a77143bd additional logging and removing interstitial session data if plugins don't return interstitials 2017-01-17 10:46:04 -05:00
pichalite
a3c05b2ea4 Send isMain to post.save filters 2017-01-16 23:40:25 +00:00
Julian Lam
762d660447 Merge pull request #5373 from pitaj/master 
Fixes #5369, bootbox wrapper translates attributes
 2017-01-16 14:41:07 -05:00
Julian Lam
183fdf06cb Merge pull request #5356 from DomLennonZA/master 
Adding more specific timings for session timeout
 2017-01-16 14:38:52 -05:00
Dominic Lennon
3f116e7636 Fixing null ttl issue for MongoSession 2017-01-16 14:58:27 +00:00
Dominic Lennon
b1f0f8fa8b Adding ttl value to the MongoStore options 2017-01-16 14:52:25 +00:00
Dominic Lennon
691b46d38b Fixing lint issues 2017-01-16 14:43:34 +00:00
Dominic Lennon
f0add97cf9 Fixing tests 2017-01-16 14:37:14 +00:00
Dominic Lennon
3507e4ce0e Adding closing <p> 2017-01-16 09:33:33 +00:00
Dominic Lennon
a06e39528f Code review change 2017-01-16 08:48:53 +00:00
Peter Jaszkowiak
c41a2f4b98 Fixes #5369, bootbox wrapper translates attributes 2017-01-15 13:58:56 -07:00
Julian Lam
9dcbe875a0 Merge branch 'master' into develop 2017-01-13 15:01:34 -05:00
Julian Lam
c99321a518 always setting app.previousUrl now, and passing cid into filter:category.topics.get hook 2017-01-13 15:01:14 -05:00
barisusakli
8f0f959d53 add filter:categories.copyPrivilegesFrom 
https://github.com/Schamper/nodebb-plugin-poll/issues/77
 2017-01-13 12:04:20 +03:00
Julian Lam
2a9088d571 updating checkGlobalPrivacySettings middleware to hook into write-api for auth 2017-01-12 15:55:56 -05:00
psychobunny
65cf2dbe55 move updateRoomUsage to after graph setup #5346 2017-01-12 14:26:03 -05:00
psychobunny
7f9381b087 closes #5346 2017-01-12 14:22:30 -05:00
psychobunny
9797f69324 action:chat.sent 2017-01-12 11:48:41 -05:00
Julian Lam
10f270d016 adding byPid zset for flags 2017-01-12 11:31:59 -05:00
Julian Lam
f58107e40a Merge remote-tracking branch 'origin/master' into develop 2017-01-12 11:29:34 -05:00
Julian Lam
bef3da5b48 pass flagId into flag.update hook 2017-01-12 10:09:47 -05:00
Julian Lam
6c04e393b5 fire hooks for flag update 2017-01-12 10:03:50 -05:00
barisusakli
8f916343f0 closes #5361 2017-01-12 14:41:35 +03:00
barisusakli
938022a0f7 add postData to action:post.delete, closes #5360 2017-01-12 14:32:38 +03:00
barisusakli
274448426d helpers.setupAdminPageRoute 2017-01-12 14:32:38 +03:00
barisusakli
1e137636c9 closes #5359 2017-01-12 14:32:38 +03:00
Misty (Bot)
759f1e2085 Latest translations and fallbacks 2017-01-12 09:21:45 +00:00
Julian Lam
d29361f4c9 added additional visibility masks for profile menu hook, also added isPrivileged user method, closes #5306 2017-01-11 15:06:28 -05:00
Julian Lam
8eb47e1987 added back missing next(), @baris 2017-01-11 14:43:56 -05:00
Julian Lam
20d035bdac hotfix to utils.isRelativeUrl to handle null or undefined first argument 2017-01-11 14:33:51 -05:00
Julian Lam
7bbb05637c flag translations and fallbacks 2017-01-11 13:20:26 -05:00
Barış Soner Uşaklı
05053071fe up composer 2017-01-11 20:12:26 +02:00
Julian Lam
bbc02dcc5d lol wtf 2017-01-11 09:44:54 -05:00
Julian Lam
a13c6f8c65 adding a safeguard into flags upgrade script @baris 2017-01-11 09:43:34 -05:00
barisusakli
367078056e add hook 2017-01-11 14:41:31 +03:00
barisusakli
0c8aa599a0 closes #5357 2017-01-11 14:40:52 +03:00
Dominic Lennon
04e5707143 Fixing lint issues 2017-01-11 11:24:27 +00:00
barisusakli
37bb6e9b6d action:user.removeUploadedPicture 2017-01-11 13:59:27 +03:00
Dominic Lennon
ed19454eca Adding more specific timing for session timings 2017-01-11 10:51:41 +00:00