Commit Graph

8850 Commits

Author SHA1 Message Date
Baris Usakli
27a6b8a713 lint fixes 2017-08-11 11:55:46 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Julian Lam
d9ad26c7c5 the meat of #5862, making chat loading not require an ajaxification 2017-08-10 17:00:43 -04:00
Baris Usakli
24bbf8fe00 closes #5869 2017-08-10 16:49:16 -04:00
Baris Usakli
e0e783ec05 closes #5866 2017-08-09 10:48:26 -04:00
Barış Soner Uşaklı
82b5246b28 fix process.env.url if it was changed 2017-08-03 20:52:09 -04:00
Baris Usakli
e836ddf6e2 fix link to topic 2017-08-03 14:14:05 -04:00
Julian Lam
4f9cbabec3 fixes #5853 2017-08-03 12:06:15 -04:00
Julian Lam
29e7bdbc99 expose license info in plugin API for installed plugins 2017-08-03 12:06:15 -04:00
Barış Soner Uşaklı
c0f390322c https://github.com/Schamper/nodebb-plugin-poll/issues/86 2017-08-02 18:12:08 -04:00
Barış Soner Uşaklı
e9f8cdc7f0 closes #5855 2017-08-02 17:42:13 -04:00
Baris Usakli
bd5edc55aa closes #5086 2017-08-02 13:45:00 -04:00
Baris Usakli
de55c8e431 closes #4070 2017-08-02 13:03:39 -04:00
Julian Lam
5fc6fe1c80 closes #5162 2017-08-02 12:27:27 -04:00
Baris Usakli
e071f94173 test debugParams.js 2017-08-01 16:51:21 -04:00
Baris Usakli
c0861277de closes #5775 2017-08-01 14:36:55 -04:00
Baris Usakli
9dc0069ce7 closes #5845 2017-08-01 14:09:55 -04:00
Baris Usakli
4ac8d29f06 closes #5847 2017-08-01 13:17:03 -04:00
Barış Soner Uşaklı
493cd16f39 closes #5848 2017-07-31 16:48:28 -04:00
Barış Soner Uşaklı
c0fa404b6c fix test 2017-07-31 16:47:28 -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
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ı
911eb32e70 fix var names 2017-07-27 19:45:54 -04:00
Barış Soner Uşaklı
f646e08a6e update tags/links for 1.5.4 2017-07-27 19:40:11 -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
Baris Usakli
6cd0582b42 add filter:user.saveSettings 2017-07-26 16:30:08 -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
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
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
Baris Usakli
91c79506b5 add tagwhitelist to topic api 2017-07-24 12:17:55 -04: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
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
Julian Lam
94c84cdc5b moving email logo upgrade script to 1.6.0 2017-07-20 16:23:55 -04:00
Julian Lam
184dacf1d7 Merge branch 'master' into develop 2017-07-20 13:19:41 -04:00