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
7844408301
linting
8 years ago
4f9cbabec3
fixes #5853
8 years ago
44353a2b39
closes #5854
8 years ago
de55c8e431
closes #4070
8 years ago
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
efe13e4038
closes #5827
8 years ago
ee5895f534
Fix #5488 Support scoped plugin npm packages
8 years ago
e9360347ea
less padding, closes #5811
8 years ago
9979987342
perserve hash when switching categories
8 years ago
da8b1b605c
#5723
8 years ago
d13eb52f39
closes #5722
8 years ago
88d5f97280
closes #5717
8 years ago
883b35243f
fix lint
8 years ago
1fa52267d4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/src/admin/manage/category.js
8 years ago
de5fe25e57
closes #5715
8 years ago
dcbe4864a9
fix bad merge / dupe code
8 years ago
82cab53508
fix digest scheduling information on cold load
8 years ago
1b98449686
closes #5704
8 years ago
3e6d51fc5a
fixes #5606 :rage2:
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
3a1eba2537
merge
8 years ago
65e31493a9
Escape ACP search values
8 years ago
236758b712
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
20eac0de94
closes #5518
8 years ago
e3205bcfad
merge
8 years ago
baa2a59f4c
Fix ace editor not working
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
484a800327
Merge branch master into develop
8 years ago
9368e666d8
Fix failing test
8 years ago
dc4f2be156
Remove ace global for eslint
8 years ago
0ef30e91ba
Use ace-builds npm package instead of vendor
...
ace can be referenced as an r.js module, reduces acp bundle size
8 years ago
1deeaaeb39
Fix #5563
8 years ago
250bb4b011
fixed leftover merge conflict artifact
8 years ago
1ebbbdd3f9
Merge remote-tracking branch 'origin/master' into develop
8 years ago
6d444ccacf
Merge pull request #5526 from NodeBB/patch_5346
...
Fix #5346
8 years ago
c199075d98
Fix #5346
8 years ago
0396e9300b
Merge pull request #5500 from RoiEXLab/fix-admin-search
...
Fix admin Search
8 years ago
860999fa6c
Merge remote-tracking branch 'origin/master' into develop
8 years ago
286d0ab203
prevent tagsinput initialization from flagging as unsaved
8 years ago
62f445ad7f
ACP: added tagsinput to other fields that are "comma separated"
8 years ago
447b7b02ca
use tagsinput for #5439 instead
8 years ago
c517733e34
Fix admin Search
8 years ago
58cbf44143
Merge branch 'master' into develop
8 years ago
007051c14c
Fix #5476
8 years ago
72e77772db
Merge branch 'master' into develop
8 years ago
dd2b930824
Resolve merge conflicts, minify only `.js` files
8 years ago
ee9d7584e4
Fix test, misc
8 years ago
1d5b3cc73f
ACP manage tags page UI changes
8 years ago
a9f144230e
Merge branch 'master' into develop
8 years ago
672d7352bb
Merge branch 'master' into develop
8 years ago
dcb0f18422
ACP manage groups UI updates
8 years ago
b227297ef3
ESlint no-use-before-define
8 years ago
93f38d4f30
ESlint no-multi-assign
...
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
8 years ago
4bb49a7171
ESlint no-unused-vars
8 years ago
c18808fdeb
ESlint no-useless-concat, no-mixed-spaces-and-tabs
8 years ago
fdf4f873bf
ESlint eqeqeq
...
and require-jsdoc, no-negated-condition
8 years ago
09e868ce5f
ESlint no-useless-escape, no-else-return
8 years ago
c4bdb72941
ESlint no-unneeded-ternary
...
and no-extend-native, no-sequences
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
a038c66549
ESlint quotes
8 years ago
604358ecc4
ESlint keyword-spacing, no-multi-spaces
8 years ago
a5a3f3089a
ESlint no-mixed-operators
8 years ago
2e031f3759
ESlint comma-spacing
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
b1b486f729
ESlint quote-props
8 years ago
3361a72725
ESlint no-plusplus
...
and no-empty, space-unary-ops
8 years ago
d1101a7fb4
ESlint dot-notation
...
and func-call-spacing
8 years ago
d7526b5e44
ESlint array-bracket-spacing
...
and object-property-newline
8 years ago
3d6bfa47c5
ESlint no-useless-return
8 years ago
52f2028206
ESlint no-multiple-empty-lines
8 years ago
b09b3aef7f
ESlint no-undef, remove global comments
8 years ago
2ba46808a1
ESlint one-var, fix comma-dangle
8 years ago
bc1d70c126
ESlint comma-dangle
8 years ago
c75391f9f5
Sound system improvements
...
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
8 years ago
0667870286
set an active state for pageview options
8 years ago
ccfec622d4
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
8 years ago
9e354a09d1
prettier stats on dashboard
8 years ago
7f124a3ccf
Merge branch 'master' into develop
8 years ago
a8fd1440d4
fixed incorrect language key in ip blacklist page
8 years ago
b5daedb7a3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
a3df9132f7
Fix styling
8 years ago
a41acead44
Fix tabs
8 years ago
6a073277ac
Fix ACP layout on tablets
8 years ago
76376f52c3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
7b234c666f
Fixes #5344
8 years ago
65cf2dbe55
move updateRoomUsage to after graph setup #5346
8 years ago
7f9381b087
closes #5346
8 years ago
3861b2dd80
Merge remote-tracking branch 'origin/master' into develop
8 years ago
cb82824c13
Fix ACP title bug with hashes ( #5331 )
8 years ago
db20df0110
Merge branch 'master' into develop
8 years ago
cae5a9ac58
Update ACE editor to latest
8 years ago
Baris Usakli
Julian Lam
Barış Soner Uşaklı
Peter Jaszkowiak
psychobunny
RoiEX
pichalite