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 |
barisusakli
|
bb146e049c
|
fix lint
|
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 |
|
psychobunny
|
fd8e647ef5
|
closes #5506
|
8 years ago |
|
barisusakli
|
f092b7754e
|
only create 1 alert for chat spam error
|
8 years ago |
|
barisusakli
|
6f49509645
|
fix newSet on redis
|
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 |
|
barisusakli
|
e85e35cf0c
|
closes #5497
|
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 |
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 |
|
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 |
|
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
|
672d7352bb
|
Merge branch 'master' into develop
|
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 |
|
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 |