Commit Graph

6808 Commits (6a6dc7ef061d1085a1d88d9c854958bab3174ffe)

Author SHA1 Message Date
Baris Usakli 9dee81b37f closes
Julian Lam f2f4f07570 Merge branch 'revamped-email-templates' into develop
Julian Lam 7fc6442af7 resized digest header
Julian Lam 5f24d63005 digest tpl
Julian Lam 0b8b3fafbf banned and invitation
Julian Lam 065b3a3a03 notif_chat tpl
Julian Lam 4dc9905b30 adding password reset image
Julian Lam 582dd1ed2e testing new footer with new_post tpl
Julian Lam 51349bb71f more email templates updated
Baris Usakli f1f8a587d4 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
Julian Lam 10d23f5447 resized logo again
Julian Lam 2eecf43eae updated logo image
Julian Lam a2627d2066 added default payload to emails, and adding nodebb logo for email header
Misty (Bot) 0e4fba7c6c Latest translations and fallbacks
Peter Jaszkowiak ee5895f534 Fix Support scoped plugin npm packages
Barış Soner Uşaklı bca79da8c6 closes
add in-topic search support to dbsearch
prevent multiple click handlers on in-topic search widget(each click was
causing multiple scrolls)
fix index
Barış Soner Uşaklı e613064b06 closes
Julian Lam 9b813af56d png instead of svg
Julian Lam 020d3acfe9 WIP welcome email
Misty (Bot) d478deb4fe Latest translations and fallbacks
Julian Lam c2f1d254cc Merge branch 'master' into develop
Julian Lam 45d940ad2b added one more client-side hook for search @barisusakli
Baris Usakli 4e7447c9d6 remove ajaxify.widgets.reposition
Barış Soner Uşaklı 923bd86662 Widgets refactor ()
* widgets refactor

render widgets server side
widgets can use all the data the template can use

* fix tests
Barış Soner Uşaklı e9360347ea less padding, closes
Misty (Bot) 2b3a88365c Latest translations and fallbacks
Misty (Bot) b117f1169e Latest translations and fallbacks
Barış Soner Uşaklı 34d9b57b26 fix wrong function name, change dom to data @julianlam
Julian Lam 3ddf332e0c added two new client-side hooks for search to allow plugins to add fields
Julian Lam 77ec169591 added two new client-side hooks for search to allow plugins to add fields
Baris Usakli e0de922ede Revert "widgets refactor"
This reverts commit 9e94edb5aa.
Baris Usakli 9e94edb5aa widgets refactor
render widgets server side
widgets can use all the data the template can use
Misty (Bot) 3e453fd1a6 Latest translations and fallbacks
Julian Lam 77d6181bd1 missing translations for ja and pt-BR
Baris Usakli 7538210b07
load correct timeago settings on cold load instead of after page load
Misty (Bot) 1a814f6f94 Latest translations and fallbacks
Julian Lam 3f2c183cbd Merge branch 'master' into develop
Misty (Bot) 8e25471685 Latest translations and fallbacks
Peter Jaszkowiak f1c955e6fc Fix scrollStop not working sometimes
Peter Jaszkowiak 6cb8440715 Fix
Use a custom header instead
Misty (Bot) fbdc2d7b3f Latest translations and fallbacks
Baris Usakli 5167c1aa4f Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Baris Usakli 9979987342 perserve hash when switching categories
Misty (Bot) 382240f25c Latest translations and fallbacks
Baris Usakli 4890731444 don't error if topicsContainer is not set
Baris Usakli e8bff210c9 clear selectedCategory on init
Misty (Bot) 6f14d00026 Latest translations and fallbacks
Barış Soner Uşaklı b64ba40c67 closes
Barış Soner Uşaklı e6cbaf6d85 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) 6b66cc8f64 Latest translations and fallbacks
Barış Soner Uşaklı fd43f38e42 closes
Misty (Bot) 631e9aea14 Latest translations and fallbacks
Baris Usakli 1f5b3ba636 closes
Misty (Bot) b0ea511b27 Latest translations and fallbacks
Baris Usakli 1b0c6741f8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Julian Lam 05434afed1 fixes
Julian Lam 9a06604968 changing local getUserName to getUserSlug, closes
Julian Lam e604d6e23e closes
Barış Soner Uşaklı 53a2a7244d closes
Misty (Bot) 3682cd9654 Latest translations and fallbacks
Misty (Bot) d8fc65808c Latest translations and fallbacks
Misty (Bot) a94e3f78a7 Latest translations and fallbacks
Barış Soner Uşaklı 7fe9366103 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı 8f5f5eb56a closes
Misty (Bot) 2d04bb9d33 Latest translations and fallbacks
Baris Usakli 0ea4ee7dda Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Misty (Bot) 02ba714fe8 Latest translations and fallbacks
Julian Lam dbcc1517eb fix chat links not working in flag details page
Misty (Bot) 5f09a8b41d Latest translations and fallbacks
Barış Soner Uşaklı d9e84b1db8 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı b13ed26587 closes
Baris Usakli 8ea5c060f5 closes
Julian Lam 32dad6ba82 Merge branch 'master' into develop
Julian Lam d1805300f7 fix nl language.json
Misty (Bot) 52e795ce78 Latest translations and fallbacks
Barış Soner Uşaklı a16aa33c8d Merge remote-tracking branch 'refs/remotes/origin/master' into develop
Barış Soner Uşaklı 1628c352fd closes
Barış Soner Uşaklı 38806fe07f closes
Misty (Bot) 1451b91fe0 Latest translations and fallbacks
Misty (Bot) 89895099ce Latest translations and fallbacks
Baris Usakli 037a0e5239 closes
also fix reverse infinite scroll when sorting is changed
Misty (Bot) b6feb0aa57 Latest translations and fallbacks
Misty (Bot) 90a15a633a Latest translations and fallbacks
Barış Soner Uşaklı 14ea9a0dd6 Merge pull request from NodeBB/import-export-ref
Import export cleanup
Misty (Bot) 54e40e815f Latest translations and fallbacks
Misty (Bot) 382a0aa42e Latest translations and fallbacks
Peter Jaszkowiak aefdc4b24b Refactor helpers import/export
Misty (Bot) 2d73e7fec2 Latest translations and fallbacks
Baris Usakli da8b1b605c
Baris Usakli d13eb52f39 closes
psychobunny 9cb5f71e08 also don't show category section in subcategory listing
psychobunny 88d5f97280 closes
psychobunny 22891215cd Merge branch 'master' of https://github.com/NodeBB/NodeBB
psychobunny 179b11b7d2 ACP allow ctrl-click to open new in new tab when settings are unsaved
Baris Usakli 883b35243f fix lint
Baris Usakli 1fa52267d4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/src/admin/manage/category.js
Baris Usakli de5fe25e57 closes
psychobunny dcbe4864a9 fix bad merge / dupe code
Misty (Bot) 25a84d7314 Latest translations and fallbacks
Barış Soner Uşaklı 9664033b73 add memory usage to info page
Misty (Bot) 57c0861310 Latest translations and fallbacks
Barış Soner Uşaklı 08aaabd33c closes
Misty (Bot) 033c31719a Latest translations and fallbacks
Misty (Bot) e1a42a49b6 Latest translations and fallbacks
Baris Usakli 5af1161e09 fix eslint
psychobunny 82cab53508 fix digest scheduling information on cold load
psychobunny 1b98449686 closes
Misty (Bot) d018fe4854 Latest translations and fallbacks
Julian Lam 3e6d51fc5a fixes :rage2:
Julian Lam 74965654de adjusted cropbox max-height calculation to be dynamic
Julian Lam 3e218a75b8 allowed zooming again @pichalite
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
Barış Soner Uşaklı a513d98e1d prevent timeago in future for new posts
Misty (Bot) dd3bf8d1ca Latest translations and fallbacks
psychobunny ad4985e5ca Merge pull request from pichalite/jquery
Delete unused file
Peter Jaszkowiak 542ae5e71f Extract in-place translation from bootbox wrapper for use anywhere
pichalite a12e159f18 Delete unused file
Misty (Bot) 57c5e0b554 Latest translations and fallbacks
Barış Soner Uşaklı 29ca1dbf08 replies/reply fix
Misty (Bot) 4fadbcbbc8 Latest translations and fallbacks
Peter Jaszkowiak 7ccfb5cdc0 Build refactor
- Target aliases and bundles
- More concurrency
- Use `--series` to force series processing
- Minifier self-hosted threading
- meta/css delegates to minifier
Misty (Bot) 11fc79051a Latest translations and fallbacks
Misty (Bot) f3008391d6 Latest translations and fallbacks
Misty (Bot) 64732af130 Latest translations and fallbacks
Barış Soner Uşaklı 5e4b9479d4 closes
Barış Soner Uşaklı 70adcd64bc
Misty (Bot) 45949be029 Latest translations and fallbacks
Julian Lam 816809ce3c fixes
Baris Usakli 51a85031f7 utils tests
Julian Lam 064a8aa6d7 Allowing custom date range to be supplied in pageviews graph, closes
Julian Lam 544faa7861 Adding Croatian to languages, closes . Hvala ti!
Barış Soner Uşaklı 873801e9f3 fix test on nodev4 remove console.logs
Barış Soner Uşaklı 29c0b8337e closes
Misty (Bot) 1d672d9024 Latest translations and fallbacks
Barış Soner Uşaklı 17b57be835 Merge pull request from NodeBB/utils-rtrim
Deprecate non-standard `String.prototype.rtrim`
Peter Jaszkowiak 2b2544a4b1 Deprecate non-standard `String.prototype.rtrim`
Julian Lam 87fbb44ca8 fixes properly
Julian Lam 6d392089e4 fixes - https://ecma-international.org/ecma-262/5.1/#sec-15.9.1.1
Misty (Bot) cb339838c0 Latest translations and fallbacks
Barış Soner Uşaklı f3deef4931 closes
Barış Soner Uşaklı 3a1eba2537 merge
Misty (Bot) 27b362fab2 Latest translations and fallbacks
Misty (Bot) 5e464f1466 Latest translations and fallbacks
Misty (Bot) 4511814c18 Latest translations and fallbacks
psychobunny 480352c650 send the banned user an email with reason + time limit if applies
psychobunny b3bd70235a refactor ban messaging; add ban duration to message; use bootbox instead of alert
psychobunny 76a2b4800b add back timeago.allowFuture so we can notify when a ban will expire
Barış Soner Uşaklı 5673769c8c add back removed rtrim method
Misty (Bot) 94735f4945 Latest translations and fallbacks
Barış Soner Uşaklı 670a5d9ca0 fix timestamp not showing for replies, remove allowFuture @julianlam
Barış Soner Uşaklı 986e52897d fix crash if locale is undefined
psychobunny 6f8e7343e6 fix for "invalid date" re:threading when replying to yourself
Barış Soner Uşaklı ea6f981686 closes
Misty (Bot) d7cbf93982 Latest translations and fallbacks
psychobunny 2fc53a1e30 closes
note: `.avatar-lg` wasn't updated to match the `develop` branch (where `avatar-xl` was added) intentionally
Barış Soner Uşaklı 6fb90a17e0 closes
Barış Soner Uşaklı 2f3aceb7d3 dont do anything if config is off
Barış Soner Uşaklı 82863a28f0 add the loaded topics after the last topic on the list
Barış Soner Uşaklı af6cde5534 show how many nodes responded
Peter Jaszkowiak 65e31493a9 Escape ACP search values
Barış Soner Uşaklı c45c4a5fdb on login display invalid-login-credentials
Misty (Bot) 066e54474e Latest translations and fallbacks
Peter Jaszkowiak 81e23a8a9a Fix
Misty (Bot) 4cf87264cf Latest translations and fallbacks
barisusakli b91b41dfa3 show database values in gbs
Barış Soner Uşaklı 081578c7f4 Merge pull request from NodeBB/auto-lang
Automatically detect user language based on browser accepts header
Misty (Bot) 94a9a6ad39 Latest translations and fallbacks
Peter Jaszkowiak 64bf542d17 Fix HTML `lang` attribute using the `defaultLang`
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
Peter Jaszkowiak c7929ec7d8 Add option for disabling language autodetection
Barış Soner Uşaklı c43a4e4b82 Merge pull request from NodeBB/fix-5536
Fix 
barisusakli 08dd412896 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/upgrade.js
barisusakli 75e5f2da74 closes
barisusakli 73700ed747 closes
Julian Lam 22b4091bdf Merge pull request from NodeBB/fix-signatures
Fix images not displaying in signatures
Misty (Bot) 30619a23c1 Latest translations and fallbacks
Misty (Bot) de6ca3710d Latest translations and fallbacks
Peter Jaszkowiak cc76a8663d Add flag for detecting if the mock is being used
Peter Jaszkowiak 30b47d39f3 Fix
barisusakli b45111d44b show max message length in error message
Peter Jaszkowiak 9d8ff4ea3e Fix images not displaying in signatures
barisusakli 7b91da067b closes
barisusakli 236758b712 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
barisusakli fb3020f892 closes
Peter Jaszkowiak 2827db3309 Fix sounds playing through multiple tabs
barisusakli 20eac0de94 closes
Misty (Bot) 6d7c70c911 Latest translations and fallbacks
barisusakli e3205bcfad merge
Peter Jaszkowiak baa2a59f4c Fix ace editor not working
Julian Lam 98047be9ce Merge pull request from NodeBB/translator-fix
Centrally escape translator tokens in every topic title
Misty (Bot) 0e615e7b09 Latest translations and fallbacks
Peter Jaszkowiak 0fe10f5e86 Escape topic titles at the source, deduplicate
barisusakli 36df4cdf97 fix cyclic dependency issue
barisusakli b8c606cbbd closes
Misty (Bot) c2ba1c270f Latest translations and fallbacks
Julian Lam a141835cf8 Merge branch 'master' into develop
Peter Jaszkowiak 1fb48ef7a7 Fix ()
* Fix 
Escape translation tokens in topic titles, descriptions, profile about, and post contents

* Fix tests
Julian Lam d18cfced96 Merge remote-tracking branch 'origin/master' into develop
Peter Jaszkowiak a8add6477c Fix merge conflicts
Julian Lam a62a4e698f Merge pull request from NodeBB/utils-translator-require
Make utils and translator easier to require
Peter Jaszkowiak 484a800327 Merge branch master into develop