1196 Commits (059a4be2048165953b4669b2e3f0e5ff81cc6bf6)

Author SHA1 Message Date
Julian Lam dee18d8442 Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam 8588a54ff2 Merge remote-tracking branch 'origin/master' into develop 7 years ago
Barış Soner Uşaklı 783d2eb073 remove console.log 7 years ago
Julian Lam eea124b312 room rename logic 7 years ago
Julian Lam c9364291fb Merge branch 'develop' into chat-rewrite 7 years ago
Julian Lam f2c251e89c Merge branch 'master' into develop 7 years ago
Barış Soner Uşaklı c12b42180d closes #6189 7 years ago
Baris Usakli 242dc41aca move privileges to same page 7 years ago
Julian Lam 5c3c608109 fix chat resizing of modal to work with flexbox implementation 7 years ago
Julian Lam 290aa312b4 fixed call to missing method, #6181 7 years ago
Barış Soner Uşaklı 548ec6baf7 closes #6144 7 years ago
Julian Lam 78c83f2561 fixing tests 7 years ago
Julian Lam 17c52a515d fix incorrect padding/margin values in images in digest 7 years ago
Barış Soner Uşaklı cb4930dac8 remove version and environment from config 7 years ago
Barış Soner Uşaklı 63388be44c closes #6084 7 years ago
Julian Lam cf9fe0d5af closes #6069 7 years ago
Barış Soner Uşaklı cd3d1f07e0
fix flagReason 7 years ago
Barış Soner Uşaklı 80ecd4ba6d closes #6036 7 years ago
Julian Lam 7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 7 years ago
Julian Lam e42ff47e5c closes #6018 7 years ago
Peter Jaszkowiak f4355efb30 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
7 years ago
Peter Jaszkowiak 189008af75 Optimize translator
- Use `slice` less
- Skip iterations with `indexOf`
7 years ago
Peter Jaszkowiak 190eea5691 Remove this useless check 7 years ago
Peter Jaszkowiak 46fafb20b9 Remove string.js dependency 7 years ago
Peter Jaszkowiak 1c35213934 Fix #5970 and forking while debugging (#5965)
* Fix forking while debugging

Debugger address in use no longer happens

* Fix cropper error
7 years ago
RoiEX e1f180ea3f Remove uneccessary undefined declaration 7 years ago
RoiEX ce9a3f20c5 Optimize transition 7 years ago
RoiEX 5e4e523198 Make progress bar finer 7 years ago
RoiEX 1fd160a4e6 Add Support for Firefox OSD 7 years ago
Peter Jaszkowiak c91dfb46f6 Switch module t.js usage to Benchpress 8 years ago
Peter Jaszkowiak abffc29128 Use Benchpress (#5901)
* Use Benchpress

* Use Benchpress.compileParse

* Error for template load failure

* Use benchpressjs package

* Compile templates on demand

* Fix user settings page

* Fix admin search to exclude `.jst` files

* Fix 500-embed

So ajaxify can still show an error if the server goes down
8 years ago
Barış Soner Uşaklı ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Barış Soner Uşaklı 5dfb2fb83a up themes, fix notif test 8 years ago
Julian Lam c1d7b06ded Fixes #5873
- Notifications.getMultiple now takes an optional uid parameter
- If a notification link in dropdown points to a topic and you're
  in said topic, you will be scrolled to the post instead of
  ajaxified to it.
8 years ago
Baris Usakli bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Baris Usakli 5a968730d5 closes #5880 8 years ago
Baris Usakli f1f8a587d4 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
8 years ago
Barış Soner Uşaklı bca79da8c6 closes #4197
add in-topic search support to dbsearch
prevent multiple click handlers on in-topic search widget(each click was
causing multiple scrolls)
fix index
8 years ago
Julian Lam c2f1d254cc Merge branch 'master' into develop 8 years ago
Barış Soner Uşaklı 34d9b57b26 fix wrong function name, change dom to data @julianlam 8 years ago
Julian Lam 3ddf332e0c added two new client-side hooks for search to allow plugins to add fields 8 years ago
Julian Lam 77ec169591 added two new client-side hooks for search to allow plugins to add fields 8 years ago
Baris Usakli 7538210b07 #5772
load correct timeago settings on cold load instead of after page load
8 years ago
Julian Lam 3f2c183cbd Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak f1c955e6fc Fix scrollStop not working sometimes 8 years ago
Baris Usakli 5167c1aa4f Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Baris Usakli 4890731444 don't error if topicsContainer is not set 8 years ago
Baris Usakli e8bff210c9 clear selectedCategory on init 8 years ago
Barış Soner Uşaklı b64ba40c67 closes #5772 8 years ago
Julian Lam e604d6e23e closes #5768 8 years ago
Barış Soner Uşaklı b13ed26587 closes #5755 8 years ago
Baris Usakli 8ea5c060f5 closes #5754 8 years ago
Peter Jaszkowiak aefdc4b24b Refactor helpers import/export 8 years ago
Baris Usakli da8b1b605c #5723 8 years ago
psychobunny 9cb5f71e08 #5717 also don't show category section in subcategory listing 8 years ago
Julian Lam 74965654de adjusted cropbox max-height calculation to be dynamic 8 years ago
Julian Lam 3e218a75b8 allowed zooming again @pichalite 8 years ago
Julian Lam 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
Peter Jaszkowiak 542ae5e71f Extract in-place translation from bootbox wrapper for use anywhere 8 years ago
Barış Soner Uşaklı 29c0b8337e closes #5645 8 years ago
Barış Soner Uşaklı 3a1eba2537 merge 8 years ago
Barış Soner Uşaklı 986e52897d fix crash if locale is undefined 8 years ago
Peter Jaszkowiak 81e23a8a9a Fix #5622 8 years ago
Barış Soner Uşaklı 081578c7f4 Merge pull request #5616 from NodeBB/auto-lang
Automatically detect user language based on browser accepts header
8 years ago
Peter Jaszkowiak 64bf542d17 Fix HTML `lang` attribute using the `defaultLang`
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
8 years ago
Barış Soner Uşaklı c43a4e4b82 Merge pull request #5615 from NodeBB/fix-5536
Fix #5536
8 years ago
barisusakli 08dd412896 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/upgrade.js
8 years ago
barisusakli 73700ed747 closes #5617 8 years ago
Peter Jaszkowiak cc76a8663d Add flag for detecting if the mock is being used 8 years ago
Peter Jaszkowiak 30b47d39f3 Fix #5536 8 years ago
Peter Jaszkowiak 9d8ff4ea3e Fix images not displaying in signatures 8 years ago
barisusakli 236758b712 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
barisusakli fb3020f892 closes #5604 8 years ago
Peter Jaszkowiak 2827db3309 Fix sounds playing through multiple tabs 8 years ago
barisusakli e3205bcfad merge 8 years ago
Peter Jaszkowiak 0fe10f5e86 Escape topic titles at the source, deduplicate 8 years ago
Julian Lam a141835cf8 Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 1fb48ef7a7 Fix #5592 (#5593)
* Fix #5592
Escape translation tokens in topic titles, descriptions, profile about, and post contents

* Fix tests
8 years ago
Peter Jaszkowiak 484a800327 Merge branch master into develop 8 years ago
Peter Jaszkowiak 980e9026f3 Fix #5588, translator ignores unclosed tokens 8 years ago
Anil Mandepudi da183e196a Fixes #5572 (#5575)
* Fixes #5572

* Adding trailing commas but in protest
8 years ago
Julian Lam 793555a344 Merge branch 'master' into develop 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 284485c885 check data.config 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 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
Julian Lam 672d7352bb Merge branch 'master' into develop 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 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 144fa8698c Eslint no-lonely-if 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 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 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
Peter Jaszkowiak f3a8256f35 ESlint strict 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 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 d9c1f6f088 ESlint no-extra-semi 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
pichalite 8dab8864f6 Add extensions for cropped images 8 years ago
barisusakli d6cdc6d34d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 8 years ago
Peter Jaszkowiak 9f15008247 Address review issues 8 years ago
Julian Lam a379b03e71 lint 8 years ago
Julian Lam f7f5b2c8d9 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam 802878c371 Merge pull request #5455 from pichalite/cropper
Make cropper in to a module
8 years ago
barisusakli e009ce5609 closes #5443 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
pichalite 2ca8f60e77 Finalize cropper module 8 years ago
pichalite d784a8dce8 Restore uploader.js 8 years ago
pichalite 43f4d9819e Linting 8 years ago
pichalite 484891472e Make cropper in to a module 8 years ago
Julian Lam 8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 8 years ago
Julian Lam b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 8 years ago
Peter Jaszkowiak bb1bfb0449 Merge branch 'master' into assets-route 8 years ago
Julian Lam bfd16d188e Merge branch 'master' into develop 8 years ago
Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts 8 years ago
pichalite de28ff5d43 Ability to crop profile images before uploading 8 years ago
Peter Jaszkowiak bb7a35b85c Fix translator catching JS errors in callbacks 8 years ago
barisusakli f1f00b63fb closes #5400 8 years ago
Julian Lam 7414482753 Merge branch 'master' into develop 8 years ago
Julian Lam 05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper 8 years ago