Commit Graph

21328 Commits

Author SHA1 Message Date
Misty (Bot)
d76a67a084 Latest translations and fallbacks 2017-07-29 09:23:20 +00:00
Julian Lam
303f1146b2 added upload_url to nconf vars @pitaj 2017-07-28 17:16:05 -04:00
Julian Lam
d06f114705 comma DANGLE 2017-07-28 16:50:18 -04:00
Julian Lam
d68a3b6862 fixed emailer init if no logo saved 2017-07-28 16:43:32 -04:00
Julian Lam
0ff413e5f8 simplifying logic 2017-07-28 15:18:50 -04:00
Julian Lam
f77f17dc20 just use emailLogo instead of doing logo with x50.png suffix 2017-07-28 15:07:44 -04:00
Julian Lam
000f8b8d92 fixed incorrect library module ref 2017-07-28 14:19:27 -04:00
Baris Usakli
875672522e Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/search.js
2017-07-28 14:19:09 -04:00
Julian Lam
e0862be3c8 added new search hook to allow for enumeration after query 2017-07-28 14:10:11 -04:00
Unbug Lee
5e16933c1f Arguments supports for start command (#5843)
* backport cache fix

* backport paste image fix

* backport crash fix

* up emoji one

* Update package.json

* backport #5692

* Incremented version number - v1.5.1

* Incremented version number - v1.5.2

* arguments supports for start command

remove concat
2017-07-28 11:35:56 -04:00
Misty (Bot)
00e588b648 Latest translations and fallbacks 2017-07-28 09:23:29 +00:00
Barış Soner Uşaklı
7a405da60f group member search change 2017-07-28 00:55:02 -04:00
Julian Lam
61deb962e3 adding notifications.get hook 2017-07-27 22:17:56 -04:00
Barış Soner Uşaklı
f6890cd971 up themes v1.5.3 2017-07-27 20:00:17 -04:00
Barış Soner Uşaklı
911eb32e70 fix var names 2017-07-27 19:45:54 -04:00
Barış Soner Uşaklı
3bcaedfe9d up markdown 2017-07-27 19:43:40 -04:00
Barış Soner Uşaklı
54f3009b4c up composer default 2017-07-27 19:42:26 -04:00
Barış Soner Uşaklı
f646e08a6e update tags/links for 1.5.4 2017-07-27 19:40:11 -04:00
Misty (Bot)
76d2e43948 Incremented version number - v1.5.3 2017-07-27 15:51:26 -04:00
Julian Lam
533b044ad1 Added new hook "filter:search.inContent"
This hook is fired after the search query returns a collection of
pids, but before those pids' summaries are retrieved. It is
useful to add a hook in here if you want to enumerate over the
matched results before they are truncated in the response payload.
2017-07-27 14:22:32 -04:00
Misty (Bot)
f2dba40496 Latest translations and fallbacks 2017-07-27 09:23:37 +00:00
Baris Usakli
6cd0582b42 add filter:user.saveSettings 2017-07-26 16:30:08 -04:00
Julian Lam
09770c4c39 up composer-default 2017-07-26 14:50:17 -04:00
Baris Usakli
a9dbdc75af closes #5825 2017-07-26 14:32:53 -04:00
Baris Usakli
949595fdf3 fix eslint 2017-07-26 13:40:17 -04:00
Baris Usakli
541b78c26d fix ipMatch data 2017-07-26 13:39:34 -04:00
Misty (Bot)
ae3d5f8aaa Latest translations and fallbacks 2017-07-26 09:23:26 +00:00
Barış Soner Uşaklı
4c126c0870 up markdown 2017-07-25 22:15:52 -04:00
Barış Soner Uşaklı
b3f6c423c6 fix test 2017-07-25 18:23:21 -04:00
Baris Usakli
5ce9f898b2 fix test 2017-07-25 16:23:43 -04:00
Julian Lam
ab8d765f4f Merge branch 'master' into develop 2017-07-25 14:13:51 -04:00
Julian Lam
f59f48c6e1 use setImmediate 2017-07-25 14:11:54 -04:00
Julian Lam
c9c27b86c4 added back logic to strip leading slashes, but after the fix to app.all 2017-07-25 13:50:37 -04:00
Baris Usakli
6087f3c8cd test router fix 2017-07-25 12:54:23 -04:00
Julian Lam
84c1a182e5 Merge remote-tracking branch 'origin/master' into develop 2017-07-25 12:28:43 -04:00
Baris Usakli
e9639833c5 add router.all 2017-07-25 12:11:11 -04:00
Julian Lam
1247b4b53b linting 2017-07-25 11:07:48 -04:00
Julian Lam
233297367b strip leading slashes from path if double-slash is accidentally used, stripping trailing slash from relative path retrieved from config.json 2017-07-25 10:39:57 -04:00
Julian Lam
36e02780fe updates to email logo usage 2017-07-25 09:45:49 -04:00
Misty (Bot)
5835334b1c Latest translations and fallbacks 2017-07-25 09:23:35 +00:00
Baris Usakli
28073cc91a lint 2017-07-24 12:28:14 -04:00
Baris Usakli
91c79506b5 add tagwhitelist to topic api 2017-07-24 12:17:55 -04:00
Misty (Bot)
b2a0ecb3c8 Latest translations and fallbacks 2017-07-24 09:23:35 +00:00
Barış Soner Uşaklı
efe13e4038 closes #5827 2017-07-23 18:10:24 -04:00
Misty (Bot)
9d0e2e90de Latest translations and fallbacks 2017-07-23 09:24:11 +00:00
Barış Soner Uşaklı
292d27716a closes #5842 2017-07-22 19:21:22 -04:00
Barış Soner Uşaklı
9d69224329 up themes fix altenate_logins to be bool 2017-07-22 19:05:22 -04:00
Misty (Bot)
e87f6f900f Latest translations and fallbacks 2017-07-22 09:23:55 +00:00
Peter Jaszkowiak
904f22522e Merge pull request #5821 from NodeBB/scoped-plugins
Support scoped plugin npm packages
Also fix logging in VS Code with the inspector debugger
2017-07-21 10:28:46 -06:00
Misty (Bot)
a1b7666c96 Latest translations and fallbacks 2017-07-21 09:24:00 +00:00