Commit Graph

9245 Commits

Author SHA1 Message Date
Barış Soner Uşaklı
b2cb3def98 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-01-31 13:48:50 -05:00
Barış Soner Uşaklı
8689ffe78f closes #6291 2018-01-31 12:25:06 -05:00
Andrew Rodrigues
9e0189ab34 added notification obj to emailer.send 2018-01-30 20:43:30 -05:00
Andrew Rodrigues
a5bae451f2 strip html tags from email subject 2018-01-30 19:53:38 -05:00
Julian Lam
897a7d84f9 Merge remote-tracking branch 'origin/master' into develop 2018-01-29 18:11:30 -05:00
Julian Lam
fad0c5f2d5 moved 1.8.0 upgrade scripts to 1.7.4 where they were actually released 2018-01-29 17:42:34 -05:00
Julian Lam
7581dd1174 Closes #6245
- Moved account info to within the profile menu hook, so it can be
  better filtered and shown to mods
- Also serves as a nice template for plugins that wish to listen
  to the profileMenu hook!
2018-01-29 17:39:00 -05:00
Julian Lam
fbf52407fd Re: #6425
- Exposing IP addresses to moderators
2018-01-29 17:16:26 -05:00
psychobunny
212486d230 hide topic upvotes on category page when rep system is disabled 2018-01-29 16:41:34 -05:00
Barış Soner Uşaklı
b907f08bf7 closes #6272 2018-01-29 12:36:57 -05:00
Barış Soner Uşaklı
8427601b04 closes #6287 2018-01-29 11:56:06 -05:00
Barış Soner Uşaklı
18ba08183c fix test 2018-01-26 19:26:48 -05:00
Barış Soner Uşaklı
08fa0683eb check is file 2018-01-26 19:04:34 -05:00
Barış Soner Uşaklı
155e20d216 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-01-26 18:58:01 -05:00
Barış Soner Uşaklı
c7506d77b0 closes #6247 2018-01-26 18:56:17 -05:00
Julian Lam
5c3155f145 firing hook on chat message load and exposing upload_url to client-side 2018-01-26 13:22:11 -05:00
Barış Soner Uşaklı
2e2b97033e closes #6248 , closes #6282 2018-01-26 12:25:59 -05:00
Baris Usakli
c37be3b58f remove my stupid code 2018-01-25 13:40:08 -05:00
Baris Usakli
c090ec301b fix lint 2018-01-25 12:31:43 -05:00
Julian Lam
a4939d78fe Moved ping to its own controller
re: #6281
2018-01-25 11:50:33 -05:00
Barış Soner Uşaklı
f7aa32cd05 dont crash if res.session.meta is not set 2018-01-25 09:16:08 -05:00
Julian Lam
49c4a23e04 closes #6277 2018-01-24 13:44:48 -05:00
Julian Lam
b14e531cee Merge remote-tracking branch 'origin/master' into develop 2018-01-23 16:57:04 -05:00
Barış Soner Uşaklı
813fdaf6f6 fix pageCount calculation 2018-01-23 15:52:54 -05:00
Barış Soner Uşaklı
d70cdf1e28 show real emails sent number 2018-01-23 12:02:43 -05:00
Barış Soner Uşaklı
c0b7d4f5b5 fix redis export 2018-01-22 16:51:12 -05:00
Barış Soner Uşaklı
8a6345ded7 possible fix for pubsub 2018-01-22 16:41:22 -05:00
Barış Soner Uşaklı
33a8cb947e Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2018-01-22 15:21:20 -05:00
Barış Soner Uşaklı
08562ad9cc closes #6276 2018-01-22 15:01:16 -05:00
Julian Lam
0cefa56a0b Fixes #6269
Also fixed issue where if homePageRoute was not set (as in brand-
new install), then categories would also show up, in this revised
logic. Oops.
2018-01-22 11:39:39 -05:00
Julian Lam
593c5047cf fixes #6269 2018-01-22 11:31:28 -05:00
Barış Soner Uşaklı
8ceb102ed3 closes #6274 2018-01-22 10:06:48 -05:00
Barış Soner Uşaklı
ae6a1b975d #6255
fix editing OP was causing title change event to be logged eventhough
title didn't change
2018-01-19 14:00:57 -05:00
Julian Lam
598675d597 outputting friendly warning if build target contains commas 2018-01-19 13:27:09 -05:00
Julian Lam
ac2e185e34 Fixes #6261
If a connection to the parent process is not detected, disable
the restart and reload buttons (as they won't work anyway).
2018-01-19 13:24:00 -05:00
Julian Lam
947c81adf0 @pitaj wut 2018-01-19 13:00:10 -05:00
Julian Lam
f6ad344ac6 Fixes #6259
Fixed issue that would cause the upgrade script to completely
wipe your customJS. This was caused by meta.config not being
populated during upgrade scripts (but only when run with
./nodebb upgrade... odd.)
2018-01-19 11:39:32 -05:00
Barış Soner Uşaklı
d8b5d40668 closes #6242 2018-01-18 13:33:06 -05:00
Ben Lubar
e85aabbe74 Allow running as a cluster without Redis (#6233)
* [database/*] Allow databases other than Redis to provide pubsub for clustering if Redis is not present

* [pubsub] Delay messages sent before the database is ready until the database is ready.

* [pubsub] Restore old behavior of not using the database in non-clustered NodeBB instances.

See comment: https://github.com/NodeBB/NodeBB/pull/6233#issuecomment-357814968
2018-01-18 13:02:56 -05:00
Barış Soner Uşaklı
7f67528280 change parallel to series in flag creation 2018-01-18 12:48:42 -05:00
Baris Usakli
61e408b4a2 closes #6253 2018-01-17 12:25:58 -05:00
Julian Lam
457194b333 Merge branch 'master' into develop 2018-01-17 11:02:02 -05:00
Barış Soner Uşaklı
fdd51f43d8 fix dirname 2018-01-16 18:33:14 -05:00
Barış Soner Uşaklı
f3fda152bf closes #6216 2018-01-16 18:20:57 -05:00
psychobunny
a048edb60b Merge branch 'master' of https://github.com/NodeBB/NodeBB 2018-01-16 16:04:02 -05:00
psychobunny
c0cf9e64fd remove lodash from built modules, use utils.debounce instead 2018-01-16 16:03:51 -05:00
Peter Jaszkowiak
c8a6caa842 Fix #6244, dpendency auto-install fixed
Node caches the result of stat on module directories
2018-01-16 16:03:31 -05:00
Julian Lam
3df2ab7cb9 exposing lodash as a client-side module 2018-01-16 12:22:55 -05:00
Barış Soner Uşaklı
e092778ba6 closes #6200 2018-01-15 15:05:33 -05:00
Barış Soner Uşaklı
13850e3586 fix categories not showing up in ACP dropdown if they are links 2018-01-15 13:23:04 -05:00