Commit Graph

14822 Commits (e3205bcfadf77b345cbb8696f9b4da7469efeee4)
 

Author SHA1 Message Date
barisusakli e3205bcfad merge
barisusakli 9f8d80e3a4 closes
Julian Lam 678db343b4 Merge pull request from NodeBB/chherypick-fixes
Cherrypick fixes from 
Peter Jaszkowiak 37c4218184 Fix error if `./nodebb build` isn't called before tests
Peter Jaszkowiak 6e5a79842f Fix
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
Peter Jaszkowiak e382bca610 Fix tests
Misty (Bot) 0e615e7b09 Latest translations and fallbacks
Peter Jaszkowiak 0fe10f5e86 Escape topic titles at the source, deduplicate
Peter Jaszkowiak ecfca21abe Up composer
psychobunny 9670d7d762 up persona
psychobunny c3423b2456 up persona
psychobunny 3598af784d up persona
psychobunny 2319af2904 up persona
barisusakli 4d1b8d7460 fix lint
barisusakli 552f850207 closes
barisusakli 92343eb2e1 fix mongo setObject if key/value is empty string
barisusakli da7bc5bb7a test fix
barisusakli 36df4cdf97 fix cyclic dependency issue
barisusakli e63559b6fd closes
barisusakli b8c606cbbd closes
Misty (Bot) c2ba1c270f Latest translations and fallbacks
barisusakli 886768ba84 check both date and upgrade count
barisusakli 05e9e88a15 fix lint
barisusakli 1cf775a4b8 upgrade script fixes
barisusakli 520d6954c1 test node 7
barisusakli f4b8cb7217 added missing return
barisusakli 6d1702c600 wait for calls to finish
Julian Lam a141835cf8 Merge branch 'master' into develop
barisusakli 7ce6c1d0ad closes
psychobunny 1179dd9503 up composer, closes
psychobunny 1e3acc0caf up persona
psychobunny b1ee7cc5b4 up persona
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
Julian Lam c3febca9c8 Merge pull request from NodeBB/patch-pitaj
Use npm instead of vendor files
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
Julian Lam a117b559b8 Merge pull request from NodeBB/translator-fix
Fix , translator ignores unclosed tokens
Peter Jaszkowiak 980e9026f3 Fix , translator ignores unclosed tokens
Julian Lam e9fb42eb03 Merge pull request from NodeBB/fix-require.main.require
Fix using `./nodebb` in other CWDs
Peter Jaszkowiak f16a40d29e Add nodebb file to linter
Peter Jaszkowiak 75d291183d Fix using nodebb in other CWDs
Peter Jaszkowiak 9368e666d8 Fix failing test
Misty (Bot) 73b6b06294 Latest translations and fallbacks
Misty (Bot) 08f001063c Latest translations and fallbacks
Peter Jaszkowiak 010473e5cc Merge branch 'master' into patch-pitaj
Peter Jaszkowiak dc4f2be156 Remove ace global for eslint