970c8b6f64
Merge branch 'develop' into chat-rewrite
7 years ago
d1ccd78ac2
Merge remote-tracking branch 'origin/master' into develop
7 years ago
b2b57d49bf
WIP add user modal
7 years ago
2b6410f201
Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission
7 years ago
8588a54ff2
Merge remote-tracking branch 'origin/master' into develop
7 years ago
23dbb42130
closes #6182
7 years ago
4a73621dca
chat privilege
7 years ago
82a95a03be
Chat message soft deletion -- closes #6181
...
Squashed commit of the following:
commit f84c06bdcc45f24ef7ffde6a8f33b48d8f97fc36
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 14:42:47 2017 -0500
added restore handler for chat messages
commit 725cd370c6ea1e8f4a28298350f3dc024d4e668e
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 14:23:52 2017 -0500
backend logic and testing complete for deletion and restoration of chat messages
commit 072da758319cc93fa4c6f8bc0d672a1b716dc06e
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 13:52:35 2017 -0500
changing message delete logic to not remove mids, but to filter when retrieving
commit 68bf373305ab82737658a7c31dc5549af4d6d69f
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 12:37:58 2017 -0500
logic to handle deletion of a deleted chat message -- added some failing tests
commit 6899d0d234fa752e227188aa69cfcabd0d0500cc
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 11:35:36 2017 -0500
chat message deletion logic
7 years ago
88b47f357b
removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite
7 years ago
99eb1d1785
closes #6163
7 years ago
f11fd566f9
add inf scroll method #6158
7 years ago
19ae8dc7e7
closes #6154
7 years ago
3551d7d68e
closes #4804
7 years ago
4f2f84e47c
#4804
7 years ago
b19310049d
closes #6136
7 years ago
f036eb18a4
closes #5936
7 years ago
71895f3736
closes #6079
7 years ago
74ceb78800
Upvote notification frequency selection ( #6087 )
...
Closes #5963
- Notify on every upvote
- Notify on every tenth upvote
- Notify logarithmically (on 10, 100, 1000...)
- Disable upvote notifications
7 years ago
5da24b4120
https://github.com/NodeBB/NodeBB/issues/6073
7 years ago
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
7 years ago
5b2a674a4f
closes #6020
7 years ago
25cd21fba8
closes #6019
7 years ago
c4310395c9
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
7 years ago
d8dc79e3c7
closes #5992
7 years ago
6a6dc7ef06
closes #5990
7 years ago
46fafb20b9
Remove string.js dependency
7 years ago
8276e20254
closes #5937
8 years ago
ff88be91fa
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
5344edc2a7
closes #5885
8 years ago
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
f161bbf956
Post queue ( #5878 )
...
* #5876
* add user to post queue table
* add time of post into queue
add posting restrictions to queue
* fix shouldQueueLogic for guests
* add test for post-queue route
8 years ago
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
8 years ago
bd5edc55aa
closes #5086
8 years ago
184dacf1d7
Merge branch 'master' into develop
8 years ago
d9ace1723c
removed references to libs that aren't used
8 years ago
cc4f4e7282
style changes
8 years ago
a2627d2066
added default payload to emails, and adding nodebb logo for email header
8 years ago
9c71da1577
sending callback with welcome email test
8 years ago
5167c1aa4f
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
3bd02d58e3
fixes logic that allowed posts beyond maximum post length if min is set to 0, @barisusakli
8 years ago
28d8be8b9d
fixed #5782
8 years ago
1b0c6741f8
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
cf444755df
closes #5729
8 years ago
50f2a4ed19
remove dupe hook
8 years ago
d9e84b1db8
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
8ea5c060f5
closes #5754
8 years ago
037a0e5239
closes #5742
...
also fix reverse infinite scroll when sorting is changed
8 years ago
e56178f72e
remove init socket.io
8 years ago
2ae855678a
closes #5735
8 years ago
6728e9a5cc
#5729
8 years ago
d13eb52f39
closes #5722
8 years ago
12524b5ce4
fix lint
8 years ago
d2b5b53cb4
refactor for sendValidationEmail, and sending better dummy data for welcome email template
8 years ago
7ce208ca13
Better dummy data for testing banned email template
8 years ago
313d48b47d
updated emailer code so digest emails when tested in ACP are sent with real data instead of incomplete fake data
8 years ago
59b1d8fbae
Merge pull request #5710 from NodeBB/_lodash
...
Switch from underscore to lodash
8 years ago
5e90e4db02
closes #5618
8 years ago
3c2d4fe649
Switch from underscore to lodash
8 years ago
890c2eff70
style changes
8 years ago
3d1b1a9423
closes #5706
8 years ago
f6ac92111b
style changes
8 years ago
1b98449686
closes #5704
8 years ago
5cb53406fe
more picture tests
8 years ago
b8cc67dfff
social tests
8 years ago
9af252b899
notifications tests
8 years ago
7fb45cc148
more tests
8 years ago
77894915eb
closes #5684
8 years ago
6fdad4b002
fix test on redis
8 years ago
70adcd64bc
#5667
8 years ago
816809ce3c
fixes #5606
8 years ago
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
ad14b0d60b
more fixes for #5660
8 years ago
bf78786a68
flag controller tests
8 years ago
3a1eba2537
merge
8 years ago
480352c650
send the banned user an email with reason + time limit if applies
8 years ago
41b4ef859f
add ban messaging when logged in
8 years ago
b3bd70235a
refactor ban messaging; add ban duration to message; use bootbox instead of alert
8 years ago
c330218920
revoke sessions as soon as user is banned
8 years ago
6fb90a17e0
closes #5613
8 years ago
7a1a030865
closes #5640
8 years ago
c0807ab327
closes #5639
8 years ago
59d0815073
closes #5637
8 years ago
7a6b685aa0
if the main and last post is purged, purge the topic as well
8 years ago
75e5f2da74
closes #5485
8 years ago
97f6c0008f
add radix
8 years ago
fb3020f892
closes #5604
8 years ago
e3205bcfad
merge
8 years ago
e382bca610
Fix tests
8 years ago
0fe10f5e86
Escape topic titles at the source, deduplicate
8 years ago
b8c606cbbd
closes #5519
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
1ed571189c
Make utils and translator easier to require
...
Move utils.walk to file.walk, backwards compatible
8 years ago
fe27d40ff6
closes #5542
8 years ago
4b3dcd1a02
Merge remote-tracking branch 'origin/master' into develop
8 years ago
7f713ee822
Admin option to allow all users to view votes ( #5534 )
...
* Admin option to allow all users to view votes
* Fix </strong></strong>
8 years ago
69dd1e3aca
Merge branch 'master' into develop
8 years ago
33bf930bb9
fixes #5528
8 years ago
5a2ff8ed0a
closes #5527
8 years ago
4ba795b5f2
adding fallbacks for meta/config.topicsPerPage
8 years ago
33d1cc6d0f
replace erroring line with operator-assignment
8 years ago
a67d48e719
#5513 ( #5520 )
...
closes #5513
8 years ago
db0a42d808
Merge branch 'master' into develop
8 years ago
364b819a42
moving sanity checks above contentLen calculation
8 years ago
dede304ee2
Merge branch 'master' into develop
8 years ago
fdb4766728
wow.
8 years ago
f35bf91e3b
Merge branch 'master' into develop
8 years ago
5359a14bac
better handling of redactor post length calculation on post edit
8 years ago
af2d9fb85b
Merge branch 'master' into develop
8 years ago
cd448f90cd
more topic tests
8 years ago
b1b87d339f
more refactors
8 years ago
45c479a101
Merge branch 'master' into develop
8 years ago
8a0cf6c0ac
more admin socket tests
8 years ago
6e7b505ea7
more linting
8 years ago
ddea9f534e
running eslint again
8 years ago
72e77772db
Merge branch 'master' into develop
8 years ago
e71bd7a27f
Merge branch 'master' into styleguide
8 years ago
3a87f2566a
more group tests
8 years ago
b7d5bc7dc8
more group tests
8 years ago
dd2b930824
Resolve merge conflicts, minify only `.js` files
8 years ago
a9f144230e
Merge branch 'master' into develop
8 years ago
25f6293821
using io.origins instead
8 years ago
91d3ce1abc
Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"
...
This reverts commit c1b1ff5c6e
8 years ago
a4c00663ff
Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"
...
This reverts commit c1b1ff5c6e
8 years ago
8154e29ad5
Merge branch 'master' into develop
8 years ago
c1b1ff5c6e
adding origin to new local ioConfig var, as per @barisusakli, re: #5472
8 years ago
672d7352bb
Merge branch 'master' into develop
8 years ago
d4c2fc3bc8
closes #5472
8 years ago
0de21cb3ff
fix tab
8 years ago
09d0ce4778
post tests
8 years ago
2dac3d2292
closes #5465 , blacklist tests
8 years ago
e427f1663e
Merge pull request #5456 from NodeBB/sounds-refactor
...
Sound system improvements
8 years ago
62e0f5f883
Merge remote-tracking branch 'origin/master' into develop
8 years ago
799f688503
closes #5463 , invitation tests
8 years ago
4bb49a7171
ESlint no-unused-vars
8 years ago
144fa8698c
Eslint no-lonely-if
8 years ago
57f89663aa
ESlint radix
8 years ago
09e868ce5f
ESlint no-useless-escape, no-else-return
8 years ago
11cb3a9554
ESlint operator-assignment, block-scoped-var
8 years ago
a0a50677da
ESlint n-loop-func, yoda
8 years ago
896c8c7343
ESlint object-curly-spacing
8 years ago
1493afee2a
ESlint indent
8 years ago
3b0dd2d1ef
ESlint padded-blocks
8 years ago
feb8405f95
ESlint eol-last
8 years ago
41896e1fc7
ESlint lines-around-directive
8 years ago
a038c66549
ESlint quotes
8 years ago
604358ecc4
ESlint keyword-spacing, no-multi-spaces
8 years ago
277a7fb8b4
ESlint key-spacing, no-trailing-spaces
8 years ago
34e233fe1d
ESlint spaced-comment
8 years ago
532951c24f
ESlint space-in-parens, block-spacing
8 years ago
3361a72725
ESlint no-plusplus
...
and no-empty, space-unary-ops
8 years ago
Julian Lam
Barış Soner Uşaklı
Baris Usakli
Peter Jaszkowiak
psychobunny
Ben Lubar