Julian Lam
|
7f8f197e60
|
Merge branch 'master' into develop
|
8 years ago |
|
Julian Lam
|
23d4497c73
|
Merge pull request #5531 from NodeBB/patch_5491
Fix #5491
|
8 years ago |
Peter Jaszkowiak
|
8c45411ccc
|
Fix #5491
|
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 |
barisusakli
|
6a4b082080
|
closes #5524
|
8 years ago |
|
barisusakli
|
5a2ff8ed0a
|
closes #5527
|
8 years ago |
|
Julian Lam
|
6d444ccacf
|
Merge pull request #5526 from NodeBB/patch_5346
Fix #5346
|
8 years ago |
Misty (Bot)
|
2106050bdc
|
Latest translations and fallbacks
|
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 |
|
Misty (Bot)
|
9f1a2b0cc9
|
Latest translations and fallbacks
|
8 years ago |
|
Misty (Bot)
|
3e93975595
|
Latest translations and fallbacks
|
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
|
5ca9e5e14c
|
ACP: distinguish <small> from regular text
|
8 years ago |
|
psychobunny
|
62f445ad7f
|
ACP: added tagsinput to other fields that are "comma separated"
|
8 years ago |
|
barisusakli
|
bb146e049c
|
fix lint
|
8 years ago |
|
psychobunny
|
debe34b96c
|
better styling for tagsinput in ACP and added it to general -> keywords
|
8 years ago |
|
psychobunny
|
447b7b02ca
|
use tagsinput for #5439 instead
|
8 years ago |
|
psychobunny
|
f2eb4b8083
|
closes #5439
|
8 years ago |
|
psychobunny
|
a67d48e719
|
#5513 (#5520)
closes #5513
|
8 years ago |
|
Misty (Bot)
|
dc4d394cd5
|
Latest translations and fallbacks
|
8 years ago |
|
psychobunny
|
8da8e4d8c3
|
closes #5469
|
8 years ago |
|
psychobunny
|
fd8e647ef5
|
closes #5506
|
8 years ago |
|
barisusakli
|
f092b7754e
|
only create 1 alert for chat spam error
|
8 years ago |
|
Julian Lam
|
f35bf91e3b
|
Merge branch 'master' into develop
|
8 years ago |
|
barisusakli
|
6f49509645
|
fix newSet on redis
|
8 years ago |
|
Misty (Bot)
|
92ad6bb4e8
|
Latest translations and fallbacks
|
8 years ago |
|
Julian Lam
|
04b66787ea
|
removed hardcoded stepsize of 1 for chart, so it can space the ticks out properly
|
8 years ago |
|
Julian Lam
|
793555a344
|
Merge branch 'master' into develop
|
8 years ago |
|
barisusakli
|
1301fb1f34
|
on chat leave close the modal
|
8 years ago |
|
barisusakli
|
8a123f7c1c
|
closes #5509
|
8 years ago |
|
barisusakli
|
69c6ee5834
|
closes #5483
|
8 years ago |
|
barisusakli
|
992e3128bd
|
closes #5499
|
8 years ago |
|
Julian Lam
|
af2d9fb85b
|
Merge branch 'master' into develop
|
8 years ago |
Accalia de Elementia
|
743a7e00b4
|
fix: auto cropper on image upload selects maximum image area by default
|
8 years ago |
|
barisusakli
|
531df7bd09
|
closes #5504
|
8 years ago |
RoiEX
|
c517733e34
|
Fix admin Search
|
8 years ago |
|
barisusakli
|
e85e35cf0c
|
closes #5497
|
8 years ago |
|
Misty (Bot)
|
99dff11462
|
Latest translations and fallbacks
|
8 years ago |
|
barisusakli
|
202bafa3e3
|
add images to bundle
|
8 years ago |
|
barisusakli
|
5ca8456340
|
move image code to client/topic/images
|
8 years ago |
|
barisusakli
|
284485c885
|
check data.config
|
8 years ago |
|
Julian Lam
|
58cbf44143
|
Merge branch 'master' into develop
|
8 years ago |
|
Misty (Bot)
|
2bbf3c4f66
|
Latest translations and fallbacks
|
8 years ago |
|
Peter Jaszkowiak
|
007051c14c
|
Fix #5476
|
8 years ago |
|
Julian Lam
|
b1ceec7571
|
Merge remote-tracking branch 'origin/master' into develop
|
8 years ago |
|
barisusakli
|
347761173a
|
helpers tests
|
8 years ago |
|
Misty (Bot)
|
a22909dbe8
|
Latest translations and fallbacks
|
8 years ago |
|
psychobunny
|
09a1ed0869
|
Merge pull request #5371 from kingjan1999/master
Update FontAwesome to 4.7.0
|
8 years ago |
|
Julian Lam
|
6e7b505ea7
|
more linting
|
8 years ago |
|
Julian Lam
|
ddea9f534e
|
running eslint again
|
8 years ago |
|
Julian Lam
|
72e77772db
|
Merge branch 'master' into develop
|
8 years ago |
|
Julian Lam
|
995f8296a4
|
linting
|
8 years ago |
|
Julian Lam
|
e71bd7a27f
|
Merge branch 'master' into styleguide
|
8 years ago |
|
barisusakli
|
048eb8a320
|
some helper tests
|
8 years ago |
|
Misty (Bot)
|
3509e12748
|
Latest translations and fallbacks
|
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 |
|
psychobunny
|
7b7565ee8e
|
Merge pull request #5468 from pichalite/acp-groups
ACP manage groups UI updates
|
8 years ago |
|
Julian Lam
|
8154e29ad5
|
Merge branch 'master' into develop
|
8 years ago |
|
Julian Lam
|
672d7352bb
|
Merge branch 'master' into develop
|
8 years ago |
|
psychobunny
|
458cbfd603
|
show dashboard notice if forum is running in dev mode
|
8 years ago |
|
psychobunny
|
ebe5ed7560
|
Merge pull request #5470 from pichalite/acp-templates
Fix ACP templates markup
|
8 years ago |
|
Misty (Bot)
|
02cc988ae7
|
Latest translations and fallbacks
|
8 years ago |
|
pichalite
|
f09f1f6ed8
|
Fix ACP templates markup
|
8 years ago |
|
pichalite
|
dcb0f18422
|
ACP manage groups UI updates
|
8 years ago |
|
Julian Lam
|
e887dda37a
|
Merge pull request #5461 from pichalite/image-dimension
Use ACP profile image dimension setting in cropper
|
8 years ago |
|
Julian Lam
|
e427f1663e
|
Merge pull request #5456 from NodeBB/sounds-refactor
Sound system improvements
|
8 years ago |
|
Julian Lam
|
62e0f5f883
|
Merge remote-tracking branch 'origin/master' into develop
|
8 years ago |
|
Misty (Bot)
|
4b21679d6f
|
Latest translations and fallbacks
|
8 years ago |
|
Misty (Bot)
|
7d8477289d
|
Latest translations and fallbacks
|
8 years ago |
|
Misty (Bot)
|
2e27ce640c
|
Latest translations and fallbacks
|
8 years ago |
|
pichalite
|
fd0f0beaf2
|
lint
|
8 years ago |
|
pichalite
|
a99572fc48
|
Use ACP profile image dimension setting in cropper
|
8 years ago |
|
Peter Jaszkowiak
|
23540afaeb
|
Resolve merge conflicts
|
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
|
144fa8698c
|
Eslint no-lonely-if
|
8 years ago |
|
Peter Jaszkowiak
|
57f89663aa
|
ESlint radix
|
8 years ago |
|
Peter Jaszkowiak
|
09e868ce5f
|
ESlint no-useless-escape, no-else-return
|
8 years ago |
|
Peter Jaszkowiak
|
11cb3a9554
|
ESlint operator-assignment, block-scoped-var
|
8 years ago |
|
Peter Jaszkowiak
|
a0a50677da
|
ESlint n-loop-func, yoda
|
8 years ago |
|
Peter Jaszkowiak
|
04bb6513b0
|
ESlint no-cond-assign, no-void, valid-jsdoc
|
8 years ago |
|
Peter Jaszkowiak
|
32dc7c23ea
|
ESlint guard-for-in, no-nested-ternary
and operator-linebreak
|
8 years ago |
|
Peter Jaszkowiak
|
c4bdb72941
|
ESlint no-unneeded-ternary
and no-extend-native, no-sequences
|
8 years ago |
|
Peter Jaszkowiak
|
64a6322002
|
ESlint no-extra-boolean-cast
and no-shadow-restricted-names
|
8 years ago |
|
Peter Jaszkowiak
|
daa169c094
|
ESlint no-unused-expressions
|
8 years ago |
|
Peter Jaszkowiak
|
ac2f69f7af
|
ESlint no-return-assign
and no-restricted-modules
|
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
|
41896e1fc7
|
ESlint lines-around-directive
|
8 years ago |