Julian Lam
cd6dcff38b
Split up customJS into customHTML and customJS for better organisation ( #5981 )
...
* WIP
* fixed customJS not actually working in footer
* Moving scripts to footer, #5980
* Added upgrade scripts for #5980
7 years ago
Peter Jaszkowiak
da9da8190f
Bump dependencies
...
Bumping eslint & configs meant making some linting fixes
For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
7 years ago
Baris Usakli
8276e20254
closes #5937
8 years ago
Baris Usakli
a2508161c6
fix hover bg color
8 years ago
Baris Usakli
bf79857b7d
closes #5908
8 years ago
Julian Lam
1034626896
Merge remote-tracking branch 'origin/develop'
8 years ago
Peter Jaszkowiak
23e7222dfa
Update Nodemailer to v4
...
also filter out .jst files from email template dropdowns
8 years ago
Peter Jaszkowiak
5885e37127
Switch admin t.js usage to Benchpress
8 years ago
Julian Lam
cd60d79a13
closes #5904
8 years ago
Barış Soner Uşaklı
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
8 years ago
Julian Lam
53ca6d1199
closes #5889
8 years ago
psychobunny
d5db97930d
prevent "plugins" menu from being highlighted when going to Extend -> Plugins
8 years ago
psychobunny
e8c40c8dc6
scroll to the actual subsection in the ACP when clicking on links pointing to that hash
8 years ago
Baris Usakli
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
Barış Soner Uşaklı
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
Baris Usakli
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
8 years ago
Julian Lam
7844408301
linting
8 years ago
Julian Lam
4f9cbabec3
fixes #5853
8 years ago
Baris Usakli
44353a2b39
closes #5854
8 years ago
Baris Usakli
de55c8e431
closes #4070
8 years ago
Julian Lam
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Barış Soner Uşaklı
efe13e4038
closes #5827
8 years ago
Peter Jaszkowiak
ee5895f534
Fix #5488 Support scoped plugin npm packages
8 years ago
Barış Soner Uşaklı
e9360347ea
less padding, closes #5811
8 years ago
Baris Usakli
9979987342
perserve hash when switching categories
8 years ago
Baris Usakli
da8b1b605c
#5723
8 years ago
Baris Usakli
d13eb52f39
closes #5722
8 years ago
psychobunny
88d5f97280
closes #5717
8 years ago
Baris Usakli
883b35243f
fix lint
8 years ago
Baris Usakli
1fa52267d4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/src/admin/manage/category.js
8 years ago
Baris Usakli
de5fe25e57
closes #5715
8 years ago
psychobunny
dcbe4864a9
fix bad merge / dupe code
8 years ago
psychobunny
82cab53508
fix digest scheduling information on cold load
8 years ago
psychobunny
1b98449686
closes #5704
8 years ago
Julian Lam
3e6d51fc5a
fixes #5606 :rage2:
8 years ago
Julian Lam
816809ce3c
fixes #5606
8 years ago
Julian Lam
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
Barış Soner Uşaklı
3a1eba2537
merge
8 years ago
Peter Jaszkowiak
65e31493a9
Escape ACP search values
8 years ago
barisusakli
236758b712
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
barisusakli
20eac0de94
closes #5518
8 years ago
barisusakli
e3205bcfad
merge
8 years ago
Peter Jaszkowiak
baa2a59f4c
Fix ace editor not working
8 years ago
Julian Lam
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Peter Jaszkowiak
484a800327
Merge branch master into develop
8 years ago
Peter Jaszkowiak
9368e666d8
Fix failing test
8 years ago
Peter Jaszkowiak
dc4f2be156
Remove ace global for eslint
8 years ago
Peter Jaszkowiak
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
Peter Jaszkowiak
1deeaaeb39
Fix #5563
8 years ago
Julian Lam
250bb4b011
fixed leftover merge conflict artifact
8 years ago
Julian Lam
1ebbbdd3f9
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Julian Lam
6d444ccacf
Merge pull request #5526 from NodeBB/patch_5346
...
Fix #5346
8 years ago
Peter Jaszkowiak
c199075d98
Fix #5346
8 years ago
Barış Soner Uşaklı
0396e9300b
Merge pull request #5500 from RoiEXLab/fix-admin-search
...
Fix admin Search
8 years ago
Julian Lam
860999fa6c
Merge remote-tracking branch 'origin/master' into develop
8 years ago
psychobunny
286d0ab203
prevent tagsinput initialization from flagging as unsaved
8 years ago
psychobunny
62f445ad7f
ACP: added tagsinput to other fields that are "comma separated"
8 years ago
psychobunny
447b7b02ca
use tagsinput for #5439 instead
8 years ago
RoiEX
c517733e34
Fix admin Search
8 years ago
Julian Lam
58cbf44143
Merge branch 'master' into develop
8 years ago
Peter Jaszkowiak
007051c14c
Fix #5476
8 years ago
Julian Lam
72e77772db
Merge branch 'master' into develop
8 years ago
Peter Jaszkowiak
dd2b930824
Resolve merge conflicts, minify only `.js` files
8 years ago
Peter Jaszkowiak
ee9d7584e4
Fix test, misc
8 years ago
pichalite
1d5b3cc73f
ACP manage tags page UI changes
8 years ago
Julian Lam
a9f144230e
Merge branch 'master' into develop
8 years ago
Julian Lam
672d7352bb
Merge branch 'master' into develop
8 years ago
pichalite
dcb0f18422
ACP manage groups UI updates
8 years ago
Peter Jaszkowiak
b227297ef3
ESlint no-use-before-define
8 years ago
Peter Jaszkowiak
93f38d4f30
ESlint no-multi-assign
...
and max-nested-callbacks, no-mixed-requires, max-statements-per-line
8 years ago
Peter Jaszkowiak
4bb49a7171
ESlint no-unused-vars
8 years ago
Peter Jaszkowiak
c18808fdeb
ESlint no-useless-concat, no-mixed-spaces-and-tabs
8 years ago
Peter Jaszkowiak
fdf4f873bf
ESlint eqeqeq
...
and require-jsdoc, no-negated-condition
8 years ago
Peter Jaszkowiak
09e868ce5f
ESlint no-useless-escape, no-else-return
8 years ago
Peter Jaszkowiak
c4bdb72941
ESlint no-unneeded-ternary
...
and no-extend-native, no-sequences
8 years ago
Peter Jaszkowiak
896c8c7343
ESlint object-curly-spacing
8 years ago
Peter Jaszkowiak
1493afee2a
ESlint indent
8 years ago
Peter Jaszkowiak
3b0dd2d1ef
ESlint padded-blocks
8 years ago
Peter Jaszkowiak
feb8405f95
ESlint eol-last
8 years ago
Peter Jaszkowiak
a038c66549
ESlint quotes
8 years ago
Peter Jaszkowiak
604358ecc4
ESlint keyword-spacing, no-multi-spaces
8 years ago
Peter Jaszkowiak
a5a3f3089a
ESlint no-mixed-operators
8 years ago
Peter Jaszkowiak
2e031f3759
ESlint comma-spacing
8 years ago
Peter Jaszkowiak
277a7fb8b4
ESlint key-spacing, no-trailing-spaces
8 years ago
Peter Jaszkowiak
34e233fe1d
ESlint spaced-comment
8 years ago
Peter Jaszkowiak
532951c24f
ESlint space-in-parens, block-spacing
8 years ago
Peter Jaszkowiak
b1b486f729
ESlint quote-props
8 years ago
Peter Jaszkowiak
3361a72725
ESlint no-plusplus
...
and no-empty, space-unary-ops
8 years ago
Peter Jaszkowiak
d1101a7fb4
ESlint dot-notation
...
and func-call-spacing
8 years ago
Peter Jaszkowiak
d7526b5e44
ESlint array-bracket-spacing
...
and object-property-newline
8 years ago
Peter Jaszkowiak
3d6bfa47c5
ESlint no-useless-return
8 years ago
Peter Jaszkowiak
52f2028206
ESlint no-multiple-empty-lines
8 years ago
Peter Jaszkowiak
b09b3aef7f
ESlint no-undef, remove global comments
8 years ago
Peter Jaszkowiak
2ba46808a1
ESlint one-var, fix comma-dangle
8 years ago
Peter Jaszkowiak
bc1d70c126
ESlint comma-dangle
8 years ago
Peter Jaszkowiak
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
psychobunny
0667870286
set an active state for pageview options
8 years ago
psychobunny
ccfec622d4
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
8 years ago
psychobunny
9e354a09d1
prettier stats on dashboard
8 years ago
Julian Lam
7f124a3ccf
Merge branch 'master' into develop
8 years ago
Julian Lam
a8fd1440d4
fixed incorrect language key in ip blacklist page
8 years ago
Julian Lam
b5daedb7a3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
pichalite
a3df9132f7
Fix styling
8 years ago
pichalite
a41acead44
Fix tabs
8 years ago
pichalite
6a073277ac
Fix ACP layout on tablets
8 years ago
Julian Lam
76376f52c3
Merge remote-tracking branch 'origin/master' into develop
8 years ago
pichalite
7b234c666f
Fixes #5344
8 years ago
psychobunny
65cf2dbe55
move updateRoomUsage to after graph setup #5346
8 years ago
psychobunny
7f9381b087
closes #5346
8 years ago
Julian Lam
3861b2dd80
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Peter Jaszkowiak
cb82824c13
Fix ACP title bug with hashes ( #5331 )
8 years ago
Julian Lam
db20df0110
Merge branch 'master' into develop
8 years ago
pichalite
cae5a9ac58
Update ACE editor to latest
8 years ago
Julian Lam
29c7ae7645
Merge remote-tracking branch 'origin/master' into develop
8 years ago
Peter Jaszkowiak
6d00d5f6a5
Fix ACP title issues
8 years ago
Julian Lam
c640bdf2b9
Merge branch 'master' into develop
8 years ago
Peter Jaszkowiak
038c45f4b6
`admin/manage` translations, misc
...
- Translate Manage templates and JS
- Change `translator.translate -> .html` into `.translateHtml` where fitting
- Translate `admin/partials/download_plugin_item`
8 years ago
Peter Jaszkowiak
94eb74646c
`admin/manage/categories` translations
...
- Fix privilege table headers so bottom borders align
- Fix `/admin` route to show Dashboard title correctly
- Translate ACP category management and privileges templates
- Translate ACP category management JS
- Remove unnecessary translates in JS
- Fix bootbox wrapper to work with translations containing html
8 years ago
Peter Jaszkowiak
862908d0eb
ACP search and title improvements
...
- Search uses translated titles if available
- Use `advanced` for `development` route titles
- Remove route title from showing up in results
- Highlight matching part of result title
- Don't show empty result contents when only title is matched
8 years ago
Peter Jaszkowiak
3008794797
`admin/general` JS translations and misc
8 years ago
Peter Jaszkowiak
95bef8f3f6
`admin/extend` JS translations and misc
8 years ago
Peter Jaszkowiak
38eba81933
ACP menu and title translations
8 years ago
Peter Jaszkowiak
606de990e9
`admin/advanced` JS translations
8 years ago
Peter Jaszkowiak
4eca23174a
Translate dynamically added admin content
8 years ago
Julian Lam
76bcc1c327
Merge branch 'flagging-refactor' into develop
8 years ago
barisusakli
55b68197aa
closes #4544
8 years ago
barisusakli
9d75c48236
closes #4563 closes #4569 closes #4566
8 years ago
Julian Lam
451c2838d0
Merge remote-tracking branch 'origin/master' into flagging-refactor
8 years ago
barisusakli
c32e6aaabb
use build module instead of forking
8 years ago
barisusakli
e86708cb0c
add cid to widgets.render
...
init date pickers in widgets ACP
8 years ago
Julian Lam
dc508fa0cb
Merge remote-tracking branch 'origin/master' into flagging-refactor
8 years ago
barisusakli
0b9829850c
closes #5273
8 years ago
Julian Lam
5d63c0aa3b
Merge remote-tracking branch 'origin/master' into flagging-refactor
8 years ago
Peter Jaszkowiak
e2ea3cb21e
Fix linting error
8 years ago
Peter Jaszkowiak
8ca98625b9
Key through search results
8 years ago
Peter Jaszkowiak
f1cfed50a1
Translate skins and themes fully
8 years ago
Julian Lam
cd3002e812
removed user flag reset method and associated socket call from ACP
8 years ago
Julian Lam
753d4b0275
wrapped up basic functionality of list and detail for flags, filter support. #5232
8 years ago
Peter Jaszkowiak
240e958fb1
Use config.relative_path instead of allcaps
8 years ago
Peter Jaszkowiak
e3dd68e19c
Explanations and simplifications
8 years ago
Peter Jaszkowiak
a431dc0305
ACP search updated to support translations
8 years ago
Julian Lam
0e8bf17ff0
re: #5211 , bringing back the RELOAD BUTTON :rage2:
8 years ago
pichalite
d4040ed52e
Fixes #5213
8 years ago
Julian Lam
66aea0eed1
closes #5167
8 years ago
Sergii Paryzhskyi
e515b791da
Fix eslint rules ( #5117 )
...
* Fix semi linter rule
* Fix semi-spacing linter rule
* Fix no-undef-init linter rule
* Fix space-before-blocks linter rule
8 years ago
HeeL
4a3c31b2dc
Fix space-before-function-paren linter rule
8 years ago
HeeL
3fa1c1f927
Fix space-infix-ops linter rule
8 years ago
barisusakli
9a55498fc1
changes to manage/users
8 years ago
Julian Lam
08a9449843
when refreshing flags page, open flag if one was open before
8 years ago
Barış Soner Uşaklı
e2cbc8bc69
fix timeago on acp users
9 years ago