8588a54ff2
Merge remote-tracking branch 'origin/master' into develop
7 years ago
783d2eb073
remove console.log
7 years ago
eea124b312
room rename logic
7 years ago
e091568d17
closes #6191
7 years ago
c9364291fb
Merge branch 'develop' into chat-rewrite
7 years ago
f2c251e89c
Merge branch 'master' into develop
7 years ago
c12b42180d
closes #6189
7 years ago
be00a1c013
Support for using yarn instead of npm, include unread counts on cold load ( #6179 )
...
* Close #6178
* Support for package managers besides npm
- Also fixes issue where upgrade-plugins wouldn't work
7 years ago
8cb914c15e
more fixes to better handle transitioning from chat to chat and closing chats, etc.
...
also modals no longer used on mobile view at all
7 years ago
025709499c
more fixes
7 years ago
242dc41aca
move privileges to same page
7 years ago
5c3c608109
fix chat resizing of modal to work with flexbox implementation
7 years ago
63b9255fa1
Merge remote-tracking branch 'refs/remotes/origin/master' into chat-permission
7 years ago
3d74fc8220
some changes to fix class names used, character countdown support, etc.
7 years ago
d967201b2a
drastically simplified main window resizing logic, some language changes
7 years ago
96084340ad
closes #6186
7 years ago
4a73621dca
chat privilege
7 years ago
290aa312b4
fixed call to missing method, #6181
7 years ago
82a95a03be
Chat message soft deletion -- closes #6181
...
Squashed commit of the following:
commit f84c06bdcc45f24ef7ffde6a8f33b48d8f97fc36
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 14:42:47 2017 -0500
added restore handler for chat messages
commit 725cd370c6ea1e8f4a28298350f3dc024d4e668e
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 14:23:52 2017 -0500
backend logic and testing complete for deletion and restoration of chat messages
commit 072da758319cc93fa4c6f8bc0d672a1b716dc06e
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 13:52:35 2017 -0500
changing message delete logic to not remove mids, but to filter when retrieving
commit 68bf373305ab82737658a7c31dc5549af4d6d69f
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 12:37:58 2017 -0500
logic to handle deletion of a deleted chat message -- added some failing tests
commit 6899d0d234fa752e227188aa69cfcabd0d0500cc
Author: Julian Lam <julian@nodebb.org>
Date: Mon Dec 18 11:35:36 2017 -0500
chat message deletion logic
7 years ago
88b47f357b
removed user.uploadFromUrl and associated logic as cropped image modal supercedes it @pichalite
7 years ago
e4ff1dc61b
closes #6174
7 years ago
802ec0e384
remove reduntant code
7 years ago
76e8bcd80b
closes #6167
7 years ago
43180d4b83
#6158
7 years ago
19ae8dc7e7
closes #6154
7 years ago
faded26dea
Revert "disallow underscore in slugs ( #6133 )"
...
This reverts commit 4fc3115f33
7 years ago
94e8b2b38d
Added ajaxify.isCold()
...
And used it in app.js, so window.scrollTo(0, 0); is not called
on cold load (since you're already at the top). Useful in low-
bandwidth modes since you might accidentally get kicked to the
top of the page due to a slow connection and delayed .init().
Slightly related to testing in #6150
7 years ago
d9e115c3e6
closes #6146
7 years ago
fd78eb6d57
closes #5533
7 years ago
3551d7d68e
closes #4804
7 years ago
548ec6baf7
closes #6144
7 years ago
4fc3115f33
disallow underscore in slugs ( #6133 )
7 years ago
78c83f2561
fixing tests
7 years ago
17c52a515d
fix incorrect padding/margin values in images in digest
7 years ago
cb4930dac8
remove version and environment from config
7 years ago
54b12119e9
add registered query param
7 years ago
c731661a39
Remove external sources from installer page ( #6101 )
...
* Remove external sources from installer page
* Remove bootstrap.min.css
* Make spinner display consistently cross-platform
* Change spinner to look better
7 years ago
947fc739eb
remove extra translator require
7 years ago
c8395a9bfb
Fixes #6056
...
Waiting for someone to qq my clever code in 3... 2...
7 years ago
64895310a9
fix #5973
7 years ago
63388be44c
closes #6084
7 years ago
4e029556df
closes #6081
7 years ago
cf9fe0d5af
closes #6069
7 years ago
cd3d1f07e0
fix flagReason
7 years ago
2ec54166f7
only show alert if on the same category
7 years ago
9eabb1dc94
closes #6044
...
use the same UX from /recent on individual categories
7 years ago
f7ccabc3cc
only add relative path if not starts with http(s)
7 years ago
80ecd4ba6d
closes #6036
7 years ago
7e0d0e0eb5
Merge remote-tracking branch 'origin/develop'
7 years ago
b74fe98dc4
closes #6031
7 years ago
008f757a9b
closes #6030
7 years ago
c9465403f5
closes #6023
7 years ago
e42ff47e5c
closes #6018
7 years ago
25cd21fba8
closes #6019
7 years ago
47143a4a09
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
7 years ago
a500e0019c
closes #6005
7 years ago
c4310395c9
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
7 years ago
d8dc79e3c7
closes #5992
7 years ago
6a6dc7ef06
closes #5990
7 years ago
f4355efb30
Optimize translator
...
- Use `slice` less
- Skip iterations with `indexOf`
7 years ago
684a66a760
fixes #5989
7 years ago
189008af75
Optimize translator
...
- Use `slice` less
- Skip iterations with `indexOf`
7 years ago
60a42aa651
Merge branch 'translator-optimization' into develop
7 years ago
190eea5691
Remove this useless check
7 years ago
46fafb20b9
Remove string.js dependency
7 years ago
0efa403a68
invoking the proper ACE Editor mode
7 years ago
ae261e073b
updating markdown and moving app.load back into ajaxify.end
7 years ago
cfacc4f133
potential fix for #5980
7 years ago
9cbf1597cd
Merge remote-tracking branch 'origin/master' into develop
7 years ago
cd6dcff38b
Split up customJS into customHTML and customJS for better organisation ( #5981 )
...
* WIP
* fixed customJS not actually working in footer
* Moving scripts to footer, #5980
* Added upgrade scripts for #5980
7 years ago
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
6852c92ed6
Merge remote-tracking branch 'origin/develop'
7 years ago
e1f180ea3f
Remove uneccessary undefined declaration
7 years ago
ce9a3f20c5
Optimize transition
7 years ago
5e4e523198
Make progress bar finer
7 years ago
1fd160a4e6
Add Support for Firefox OSD
7 years ago
da9da8190f
Bump dependencies
...
Bumping eslint & configs meant making some linting fixes
For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
7 years ago
1f5d14dda4
place some code under the right loop ( #5945 )
7 years ago
dc87d7fc0f
Use .js instead of .jst
...
Fix #5934
7 years ago
8276e20254
closes #5937
7 years ago
a2508161c6
fix hover bg color
7 years ago
b8ce4023c3
finish redirect if success returned 5x, via installer
7 years ago
e64c1d28e6
closes #5931
7 years ago
514317ab20
using translator.unescape instead of replaces
7 years ago
211482bbc0
fixes #5927
7 years ago
bf79857b7d
closes #5908
8 years ago
1034626896
Merge remote-tracking branch 'origin/develop'
8 years ago
23e7222dfa
Update Nodemailer to v4
...
also filter out .jst files from email template dropdowns
8 years ago
cfba8970e1
Fix posts block usage in categories page
8 years ago
c91dfb46f6
Switch module t.js usage to Benchpress
8 years ago
71aab79a9a
Switch client t.js usage to Benchpress
8 years ago
dc3f89a505
ajaxify t.js usage to Benchpress
8 years ago
5885e37127
Switch admin t.js usage to Benchpress
8 years ago
cd60d79a13
closes #5904
8 years ago
60e0f4ced9
minor typo
8 years ago
5cc39e8546
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
# src/views/admin/manage/ip-blacklist.tpl
8 years ago
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
53ca6d1199
closes #5889
8 years ago
73d4517d27
Revert "fixes #5894"
...
This reverts commit e2b40ddf34
8 years ago
9d2bf4746c
Revert "fix reload loop for guests"
...
This reverts commit a67a0b0a08
8 years ago
a67a0b0a08
fix reload loop for guests
8 years ago
a13a5c02e9
closes #5899
8 years ago
e2b40ddf34
fixes #5894
8 years ago
d5db97930d
prevent "plugins" menu from being highlighted when going to Extend -> Plugins
8 years ago
e8c40c8dc6
scroll to the actual subsection in the ACP when clicking on links pointing to that hash
8 years ago
ff88be91fa
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
5dfb2fb83a
up themes, fix notif test
8 years ago
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
bc0645dc26
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
5a968730d5
closes #5880
8 years ago
575c9a41cd
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
f161bbf956
Post queue ( #5878 )
...
* #5876
* add user to post queue table
* add time of post into queue
add posting restrictions to queue
* fix shouldQueueLogic for guests
* add test for post-queue route
8 years ago
27a6b8a713
lint fixes
8 years ago
bc6b1a8f56
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# public/src/admin/extend/plugins.js
8 years ago
d9ad26c7c5
the meat of #5862 , making chat loading not require an ajaxification
8 years ago
902b823f4d
adding mobile handling of chats' recent list links
8 years ago
bc9a125034
re: #5862 , setting chat list height even if no message list is present
8 years ago
128b922873
fixes #5428
8 years ago
7844408301
linting
8 years ago
8928db539b
add missing radix
8 years ago
4f9cbabec3
fixes #5853
8 years ago
51facb3cb0
closes #5857
8 years ago
3e4a4d7d55
remove header selector
8 years ago
d32f5459b7
fix unread icon
8 years ago
44353a2b39
closes #5854
8 years ago
de55c8e431
closes #4070
8 years ago
0ecd2300b3
Closes #5849
8 years ago
875672522e
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/search.js
8 years ago
7a405da60f
group member search change
8 years ago
84c1a182e5
Merge remote-tracking branch 'origin/master' into develop
8 years ago
efe13e4038
closes #5827
8 years ago
904f22522e
Merge pull request #5821 from NodeBB/scoped-plugins
...
Support scoped plugin npm packages
Also fix logging in VS Code with the inspector debugger
8 years ago
184dacf1d7
Merge branch 'master' into develop
8 years ago
c4fbed24f8
Squashed commit of the following:
...
commit 9c86d9b2904e14927cd7e9679b92aec0951d1063
Merge: ebfa63a 5a7f811
Author: Julian Lam <julian@nodebb.org>
Date: Thu Jul 20 08:41:39 2017 -0400
Merge branch 'noscript-login' of https://github.com/An-dz/NodeBB into noscript
commit 5a7f81185e8f9bd7d2d011c3d495988be7e437a3
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Mon Jul 17 23:07:14 2017 -0300
Rename clashing variable 'next'
commit ebfa63a984073a58c17aa408c363cdb03ef89985
Merge: c1801cd f159d0d
Author: Julian Lam <julian@nodebb.org>
Date: Mon Jul 17 16:30:40 2017 -0400
Merge branch 'noscript-logout' of https://github.com/An-dz/NodeBB into noscript
commit c1801cda14e6363491e30b659902e2ae71f7e1f7
Merge: 7a5f9f3 9fd542d
Author: Julian Lam <julian@nodebb.org>
Date: Mon Jul 17 16:30:31 2017 -0400
Merge branch 'noscript-register' of https://github.com/An-dz/NodeBB into noscript
commit 7a5f9f35abc834bb72ddddc9ca07d34f2fde8353
Merge: 44851f9https://github.com/An-dz/NodeBB into noscript
commit f159d0d9ef1b7f600e830a96fdb4b9c87c79bb4a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jul 6 12:16:38 2017 -0300
Prevent form submit
Required for theme change
commit d37b95cb71d32d4483190609798e244c331db165
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jul 6 01:49:52 2017 -0300
Prevent link action with scripts
Required for the theme change that changes the buttons to `a` tags.
commit 9fd542d8970b7d1a4126f4edc4b44eab7d708fb0
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:57:56 2017 -0300
Fix tests
commit cdad5bf8c2891ad76f7441fd4d8a74b058a14e6d
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 19:09:17 2017 -0300
Update error handling
commit 4ff11cd136a4fb98483f837e2cebc741380dfe76
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 17:29:08 2017 -0300
Remove async waterfall
commit df01d44e821a70c984b89e9585a325c3e02c6e37
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:43 2017 -0300
Set noscript compose as noscript at start
commit 4bcc380da72239b8315cc849a77a3036e06e4a12
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Wed Jul 5 16:59:12 2017 -0300
Remove last useless next
commit b5eac6fea11e209934c0648a7e75ad07a2167123
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:35:08 2017 -0300
Last function requires no next
commit 20a5cce6e6e32a454c304c448383707ec44c75a8
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 18:06:58 2017 -0300
Remove more useless next calls
commit 85ee22a79bcbbb1995106f43d4c74d6ba9206cab
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 17:46:07 2017 -0300
Remove useless next calls
commit 7d984c47ad24faac1fe537dee4a5a7d697e8634c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:45:31 2017 -0300
Support old themes
commit 4a09dfbd08253115c342a9e829c4e6940cecb8cc
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sun Jul 2 15:37:23 2017 -0300
Moved all error handling into helpers function
commit 391aa6e67ef9ab67304005e14ac0633cdb630713
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Thu Jun 8 15:37:37 2017 -0300
ESLint - Fix mixed conditionals
commit 80ccc6fd581d791f31e7ab62de8de611837bfc3c
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:08:15 2017 -0300
Compose without scripts
commit 2aca811256721238ca0cede4954213d369009885
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 18:00:44 2017 -0300
Register without scripts
commit 097bb51577fb26f8e22f86dc274cb670ab606a8a
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:42:15 2017 -0300
Logout without scripts
commit d497e08109891079656fee1c145043a9c0e55f2e
Author: André Zanghelini <an_dz@simutrans-forum>
Date: Sat Jun 3 16:27:10 2017 -0300
Login without script
8 years ago
9b491e4c2e
Add post images hook ( #5828 )
...
* Add post images hook
This hook would allow plugins to manipulate images inside posts after images are manipulated by nodebb (for example, delay loading). Without this hook we can manipulate images by searching post data for them and manipulate that data, but any change on that level is either erased by nodebb once image loading starts (if delay is turned on) or it disables native image behaviour by changing image code so native behaviour is not triggered.
Hook at this place works for both delayed loading turned on and off.
Usage for this kind of hook was talked about here: https://community.nodebb.org/topic/10960/opening-uploaded-images-in-modal-windows
* trying to fix Travis error
* Update images.js
Hook moved out of wrapImagesInLinks function to places where images are actually loaded. One of the places is inside unloadImage function but in place where loading is happening because of failed if check (delayImageLoading not se in users configuration).
8 years ago
0a4b76357a
#5830
8 years ago
9dee81b37f
closes #5830
8 years ago
f1f8a587d4
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# package.json
8 years ago
ee5895f534
Fix #5488 Support scoped plugin npm packages
8 years ago
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
c2f1d254cc
Merge branch 'master' into develop
8 years ago
45d940ad2b
added one more client-side hook for search @barisusakli
8 years ago
4e7447c9d6
remove ajaxify.widgets.reposition
8 years ago
923bd86662
Widgets refactor ( #5817 )
...
* widgets refactor
render widgets server side
widgets can use all the data the template can use
* fix tests
8 years ago
e9360347ea
less padding, closes #5811
8 years ago
34d9b57b26
fix wrong function name, change dom to data @julianlam
8 years ago
3ddf332e0c
added two new client-side hooks for search to allow plugins to add fields
8 years ago
77ec169591
added two new client-side hooks for search to allow plugins to add fields
8 years ago
e0de922ede
Revert "widgets refactor"
...
This reverts commit 9e94edb5aa
8 years ago
9e94edb5aa
widgets refactor
...
render widgets server side
widgets can use all the data the template can use
8 years ago
7538210b07
#5772
...
load correct timeago settings on cold load instead of after page load
8 years ago
3f2c183cbd
Merge branch 'master' into develop
8 years ago
f1c955e6fc
Fix scrollStop not working sometimes
8 years ago
6cb8440715
Fix #5793
...
Use a custom header instead
8 years ago
5167c1aa4f
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
9979987342
perserve hash when switching categories
8 years ago
4890731444
don't error if topicsContainer is not set
8 years ago
e8bff210c9
clear selectedCategory on init
8 years ago
b64ba40c67
closes #5772
8 years ago
e6cbaf6d85
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
fd43f38e42
closes #5773
8 years ago
1f5b3ba636
closes #5771
8 years ago
1b0c6741f8
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
9a06604968
changing local getUserName to getUserSlug, closes julianlam/nodebb-plugin-mentions#89
8 years ago
e604d6e23e
closes #5768
8 years ago
53a2a7244d
closes #5765
8 years ago
7fe9366103
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
8f5f5eb56a
closes #5761
8 years ago
0ea4ee7dda
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
dbcc1517eb
fix chat links not working in flag details page
8 years ago
d9e84b1db8
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
b13ed26587
closes #5755
8 years ago
8ea5c060f5
closes #5754
8 years ago
a16aa33c8d
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
1628c352fd
closes #5750
8 years ago
38806fe07f
closes #5752
8 years ago
037a0e5239
closes #5742
...
also fix reverse infinite scroll when sorting is changed
8 years ago
aefdc4b24b
Refactor helpers import/export
8 years ago
da8b1b605c
#5723
8 years ago
d13eb52f39
closes #5722
8 years ago
9cb5f71e08
#5717 also don't show category section in subcategory listing
8 years ago
88d5f97280
closes #5717
8 years ago
22891215cd
Merge branch 'master' of https://github.com/NodeBB/NodeBB
8 years ago
179b11b7d2
ACP allow ctrl-click to open new in new tab when settings are unsaved
8 years ago
883b35243f
fix lint
8 years ago
1fa52267d4
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/src/admin/manage/category.js
8 years ago
de5fe25e57
closes #5715
8 years ago
dcbe4864a9
fix bad merge / dupe code
8 years ago
08aaabd33c
closes #5642
8 years ago
5af1161e09
fix eslint
8 years ago
82cab53508
fix digest scheduling information on cold load
8 years ago
1b98449686
closes #5704
8 years ago
3e6d51fc5a
fixes #5606 :rage2:
8 years ago
74965654de
adjusted cropbox max-height calculation to be dynamic
8 years ago
3e218a75b8
allowed zooming again @pichalite
8 years ago
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
a513d98e1d
prevent timeago in future for new posts
8 years ago
542ae5e71f
Extract in-place translation from bootbox wrapper for use anywhere
8 years ago
29ca1dbf08
replies/reply fix
8 years ago
70adcd64bc
#5667
8 years ago
816809ce3c
fixes #5606
8 years ago
51a85031f7
utils tests
8 years ago
064a8aa6d7
Allowing custom date range to be supplied in pageviews graph, closes #5541
8 years ago
29c0b8337e
closes #5645
8 years ago
17b57be835
Merge pull request #5661 from NodeBB/utils-rtrim
...
Deprecate non-standard `String.prototype.rtrim`
8 years ago
2b2544a4b1
Deprecate non-standard `String.prototype.rtrim`
8 years ago
87fbb44ca8
fixes #5660 properly
8 years ago
6d392089e4
fixes #5660 - https://ecma-international.org/ecma-262/5.1/#sec-15.9.1.1
8 years ago
f3deef4931
closes #5656
8 years ago
3a1eba2537
merge
8 years ago
b3bd70235a
refactor ban messaging; add ban duration to message; use bootbox instead of alert
8 years ago
76a2b4800b
add back timeago.allowFuture so we can notify when a ban will expire
8 years ago
5673769c8c
add back removed rtrim method
8 years ago
670a5d9ca0
fix timestamp not showing for replies, remove allowFuture @julianlam
8 years ago
986e52897d
fix crash if locale is undefined
8 years ago
6f8e7343e6
fix for "invalid date" re:threading when replying to yourself
8 years ago
6fb90a17e0
closes #5613
8 years ago
2f3aceb7d3
dont do anything if config is off
8 years ago
82863a28f0
add the loaded topics after the last topic on the list
8 years ago
65e31493a9
Escape ACP search values
8 years ago
81e23a8a9a
Fix #5622
8 years ago
081578c7f4
Merge pull request #5616 from NodeBB/auto-lang
...
Automatically detect user language based on browser accepts header
8 years ago
64bf542d17
Fix HTML `lang` attribute using the `defaultLang`
...
Themes need `lang="{function.localeToHTML, userLang, defaultLang}"` in
their header.tpl file
8 years ago
c43a4e4b82
Merge pull request #5615 from NodeBB/fix-5536
...
Fix #5536
8 years ago
08dd412896
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
...
# Conflicts:
# src/upgrade.js
8 years ago
75e5f2da74
closes #5485
8 years ago
73700ed747
closes #5617
8 years ago
cc76a8663d
Add flag for detecting if the mock is being used
8 years ago
30b47d39f3
Fix #5536
8 years ago
b45111d44b
show max message length in error message
8 years ago
9d8ff4ea3e
Fix images not displaying in signatures
8 years ago
236758b712
Merge remote-tracking branch 'refs/remotes/origin/master' into develop
8 years ago
fb3020f892
closes #5604
8 years ago
2827db3309
Fix sounds playing through multiple tabs
8 years ago
20eac0de94
closes #5518
8 years ago
e3205bcfad
merge
8 years ago
baa2a59f4c
Fix ace editor not working
8 years ago
0fe10f5e86
Escape topic titles at the source, deduplicate
8 years ago
36df4cdf97
fix cyclic dependency issue
8 years ago
b8c606cbbd
closes #5519
8 years ago
a141835cf8
Merge branch 'master' into develop
8 years ago
1fb48ef7a7
Fix #5592 ( #5593 )
...
* Fix #5592
Escape translation tokens in topic titles, descriptions, profile about, and post contents
* Fix tests
8 years ago
d18cfced96
Merge remote-tracking branch 'origin/master' into develop
8 years ago
a8add6477c
Fix merge conflicts
8 years ago
a62a4e698f
Merge pull request #5578 from NodeBB/utils-translator-require
...
Make utils and translator easier to require
8 years ago
484a800327
Merge branch master into develop
8 years ago
980e9026f3
Fix #5588 , translator ignores unclosed tokens
8 years ago
9368e666d8
Fix failing test
8 years ago
010473e5cc
Merge branch 'master' into patch-pitaj
8 years ago
dc4f2be156
Remove ace global for eslint
8 years ago
Julian Lam
Barış Soner Uşaklı
Peter Jaszkowiak
Baris Usakli
Muhammad Osama Arshad
RoiEX
RoiEX
Chế Tiệp Chân Khoa
Andrew Rodrigues
Stjepan Osojnički