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
08aaabd33c
closes #5642
8 years ago
5af1161e09
fix eslint
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
74965654de
adjusted cropbox max-height calculation to be dynamic
8 years ago
3e218a75b8
allowed zooming again @pichalite
8 years ago
30bec51a21
removed cropper zoom and using image scaling to show entire image. Click on modal backdrop during crop will no longer close modal
8 years ago
a513d98e1d
prevent timeago in future for new posts
8 years ago
542ae5e71f
Extract in-place translation from bootbox wrapper for use anywhere
8 years ago
29ca1dbf08
replies/reply fix
8 years ago
70adcd64bc
#5667
8 years ago
816809ce3c
fixes #5606
8 years ago
51a85031f7
utils tests
8 years ago
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
29c0b8337e
closes #5645
8 years ago
17b57be835
Merge pull request #5661 from NodeBB/utils-rtrim
...
Deprecate non-standard `String.prototype.rtrim`
8 years ago
2b2544a4b1
Deprecate non-standard `String.prototype.rtrim`
8 years ago
87fbb44ca8
fixes #5660 properly
8 years ago
6d392089e4
fixes #5660 - https://ecma-international.org/ecma-262/5.1/#sec-15.9.1.1
8 years ago
f3deef4931
closes #5656
8 years ago
3a1eba2537
merge
8 years ago
b3bd70235a
refactor ban messaging; add ban duration to message; use bootbox instead of alert
8 years ago
76a2b4800b
add back timeago.allowFuture so we can notify when a ban will expire
8 years ago
5673769c8c
add back removed rtrim method
8 years ago
670a5d9ca0
fix timestamp not showing for replies, remove allowFuture @julianlam
8 years ago
986e52897d
fix crash if locale is undefined
8 years ago
6f8e7343e6
fix for "invalid date" re:threading when replying to yourself
8 years ago
6fb90a17e0
closes #5613
8 years ago
2f3aceb7d3
dont do anything if config is off
8 years ago
82863a28f0
add the loaded topics after the last topic on the list
8 years ago
65e31493a9
Escape ACP search values
8 years ago
81e23a8a9a
Fix #5622
8 years ago
081578c7f4
Merge pull request #5616 from NodeBB/auto-lang
...
Automatically detect user language based on browser accepts header
8 years ago
64bf542d17
Fix HTML `lang` attribute using the `defaultLang`
...
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
8 years ago
c43a4e4b82
Merge pull request #5615 from NodeBB/fix-5536
...
Fix #5536
8 years ago
08dd412896
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/upgrade.js
8 years ago
75e5f2da74
closes #5485
8 years ago
73700ed747
closes #5617
8 years ago
cc76a8663d
Add flag for detecting if the mock is being used
8 years ago
30b47d39f3
Fix #5536
8 years ago
b45111d44b
show max message length in error message
8 years ago
9d8ff4ea3e
Fix images not displaying in signatures
8 years ago
236758b712
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
fb3020f892
closes #5604
8 years ago
2827db3309
Fix sounds playing through multiple tabs
8 years ago
20eac0de94
closes #5518
8 years ago
e3205bcfad
merge
8 years ago
baa2a59f4c
Fix ace editor not working
8 years ago
0fe10f5e86
Escape topic titles at the source, deduplicate
8 years ago
36df4cdf97
fix cyclic dependency issue
8 years ago
b8c606cbbd
closes #5519
8 years ago
a141835cf8
Merge branch 'master' into develop
8 years ago
1fb48ef7a7
Fix #5592 ( #5593 )
...
* Fix #5592
Escape translation tokens in topic titles, descriptions, profile about, and post contents
* Fix tests
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
a8add6477c
Fix merge conflicts
8 years ago
a62a4e698f
Merge pull request #5578 from NodeBB/utils-translator-require
...
Make utils and translator easier to require
8 years ago
484a800327
Merge branch master into develop
8 years ago
980e9026f3
Fix #5588 , translator ignores unclosed tokens
8 years ago
9368e666d8
Fix failing test
8 years ago
010473e5cc
Merge branch 'master' into patch-pitaj
8 years ago
dc4f2be156
Remove ace global for eslint
8 years ago
126237e2c9
Merge pull request #5576 from pichalite/zxcvbn
...
Closes #5521
8 years ago
1892492505
Deprecate utils.walk, remove prototype modification
8 years ago
1ed571189c
Make utils and translator easier to require
...
Move utils.walk to file.walk, backwards compatible
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
4c89497cc4
Closes #5521
8 years ago
da183e196a
Fixes #5572 ( #5575 )
...
* Fixes #5572
* Adding trailing commas but in protest
8 years ago
1deeaaeb39
Fix #5563
8 years ago
7afe8a32f6
Merge branch 'master' into develop
8 years ago
1594a84e1c
fixes #5536
8 years ago
b649eb95f8
Merge remote-tracking branch 'origin/master' into develop
8 years ago
6060b8e13b
fix tests
8 years ago
fe27d40ff6
closes #5542
8 years ago
6682e048ea
wrapImagesInLinks with <a download> attribute
...
if the `src` of the `img` does not have an extension, most browsers will trigger a download with whatever filename is set, also without an extension, so when it's opened in any OS, it wont have a default application to open it with.
So, In this case, if the `alt` attribute has an extension (meaning if it looks like filename) - we use that with the html5 [`download` attr](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a#attr-download )
The PR does not affect any src if they have an extension.
8 years ago
7f8f197e60
Merge branch 'master' into develop
8 years ago
23d4497c73
Merge pull request #5531 from NodeBB/patch_5491
...
Fix #5491
8 years ago
8c45411ccc
Fix #5491
8 years ago
250bb4b011
fixed leftover merge conflict artifact
8 years ago
1ebbbdd3f9
Merge remote-tracking branch 'origin/master' into develop
8 years ago
6a4b082080
closes #5524
8 years ago
5a2ff8ed0a
closes #5527
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
bb146e049c
fix lint
8 years ago
447b7b02ca
use tagsinput for #5439 instead
8 years ago
f2eb4b8083
closes #5439
8 years ago
a67d48e719
#5513 ( #5520 )
...
closes #5513
8 years ago
fd8e647ef5
closes #5506
8 years ago
f092b7754e
only create 1 alert for chat spam error
8 years ago
6f49509645
fix newSet on redis
8 years ago
04b66787ea
removed hardcoded stepsize of 1 for chart, so it can space the ticks out properly
8 years ago
793555a344
Merge branch 'master' into develop
8 years ago
1301fb1f34
on chat leave close the modal
8 years ago
8a123f7c1c
closes #5509
8 years ago
69c6ee5834
closes #5483
8 years ago
992e3128bd
closes #5499
8 years ago
af2d9fb85b
Merge branch 'master' into develop
8 years ago
743a7e00b4
fix: auto cropper on image upload selects maximum image area by default
8 years ago
531df7bd09
closes #5504
8 years ago
c517733e34
Fix admin Search
8 years ago
e85e35cf0c
closes #5497
8 years ago
202bafa3e3
add images to bundle
8 years ago
5ca8456340
move image code to client/topic/images
8 years ago
284485c885
check data.config
8 years ago
58cbf44143
Merge branch 'master' into develop
8 years ago
007051c14c
Fix #5476
8 years ago
b1ceec7571
Merge remote-tracking branch 'origin/master' into develop
8 years ago
347761173a
helpers 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
995f8296a4
linting
8 years ago
e71bd7a27f
Merge branch 'master' into styleguide
8 years ago
048eb8a320
some helper tests
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
7b7565ee8e
Merge pull request #5468 from pichalite/acp-groups
...
ACP manage groups UI updates
8 years ago
672d7352bb
Merge branch 'master' into develop
8 years ago
dcb0f18422
ACP manage groups UI updates
8 years ago
e887dda37a
Merge pull request #5461 from pichalite/image-dimension
...
Use ACP profile image dimension setting in cropper
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
fd0f0beaf2
lint
8 years ago
a99572fc48
Use ACP profile image dimension setting in cropper
8 years ago
23540afaeb
Resolve merge conflicts
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
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
04bb6513b0
ESlint no-cond-assign, no-void, valid-jsdoc
8 years ago
32dc7c23ea
ESlint guard-for-in, no-nested-ternary
...
and operator-linebreak
8 years ago
c4bdb72941
ESlint no-unneeded-ternary
...
and no-extend-native, no-sequences
8 years ago
64a6322002
ESlint no-extra-boolean-cast
...
and no-shadow-restricted-names
8 years ago
daa169c094
ESlint no-unused-expressions
8 years ago
Baris Usakli
psychobunny
Barış Soner Uşaklı
Julian Lam
Peter Jaszkowiak
pichalite
Anil Mandepudi
Aziz Khoury
Accalia de Elementia
RoiEX