19ae8dc7e7
closes #6154
8 years ago
c8395a9bfb
Fixes #6056
...
Waiting for someone to qq my clever code in 3... 2...
8 years ago
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
8 years ago
008f757a9b
closes #6030
8 years ago
25cd21fba8
closes #6019
8 years ago
c4310395c9
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
8 years ago
d8dc79e3c7
closes #5992
8 years ago
0efa403a68
invoking the proper ACE Editor mode
8 years ago
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
8 years ago
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
8 years ago
8276e20254
closes #5937
8 years ago
a2508161c6
fix hover bg color
8 years ago
bf79857b7d
closes #5908
8 years ago
1034626896
Merge remote-tracking branch 'origin/develop'
8 years ago
23e7222dfa
Update Nodemailer to v4
...
also filter out .jst files from email template dropdowns
8 years ago
5885e37127
Switch admin t.js usage to Benchpress
8 years ago
cd60d79a13
closes #5904
8 years ago
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
8 years ago
53ca6d1199
closes #5889
8 years ago
d5db97930d
prevent "plugins" menu from being highlighted when going to Extend -> Plugins
8 years ago
e8c40c8dc6
scroll to the actual subsection in the ACP when clicking on links pointing to that hash
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
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
Barış Soner Uşaklı
Julian Lam
Baris Usakli
Peter Jaszkowiak
psychobunny