Commit Graph

1473 Commits

Author SHA1 Message Date
Peter Jaszkowiak
11b9cb7688 Fix #6076, action:home.get:* returned to previous functionality (#6077)
Added tests to confirm `buildHeader` is used and `/api` works
2017-11-17 08:11:33 -05:00
Peter Jaszkowiak
c47c47f7e3 Use less memory to build translation files (#6070)
* Change languages build to use less memory

Add graceful-fs so no ned to worry about fs limits

* Specify encoding for fs.readFile

Use eachLimit since graceful-fs handles that now
2017-11-16 17:43:52 -05:00
Barış Soner Uşaklı
dd176dd5f2 Notification delivery (#6072)
* ability for users to choose how they receive notifications

add type field to more notifications, the type field is used to
determine what to do based on user
setting(none,notification,email,notificationemail)

* change var name to types

* cleanup

* add event types for privileged users

* remove unused language keys

* fix uids check

* changed if statements

* upgrade script to preserver old settings
2017-11-15 21:35:10 -05:00
Baris Usakli
1eca1f1da9 add missing require 2017-11-15 14:49:04 -05:00
Baris Usakli
38e52a65be fix breadcrumbs and home /api route not loading 2017-11-15 14:48:28 -05:00
Baris Usakli
4fdc1b99c6 remove unnecessary variable 2017-11-08 16:32:16 -05:00
acardinale
78e65ab8c8 Fix if cover URL is external URL (#6026)
* Fix if cover URL is external URL

Currently, when cover:url is an external URL, it's concat with relative path

* Fix if cover URL is external URL

Currently, when cover:url is an external URL, it's concat with relative path [fix barisusakli]

* Fix missing '

* Add User (uid) Welcome Notification

* Revert "Fix missing '"

This reverts commit 2da2d98ae2.

* Revert "Revert "Fix missing '""

This reverts commit f4fca746e8.

* Revert "Add User (uid) Welcome Notification"

This reverts commit 831e291e78.

* Fix eslint doesnt like nesting ternary operators

* fix space after if
2017-11-06 14:45:58 -05:00
Barış Soner Uşaklı
e4ea4d5134 move composer routes to its own file 2017-11-05 14:05:21 -05:00
Peter Jaszkowiak
bbdc55cb3a Better fix for #5993 (#6034)
* Better fix for #5993

Also a nice newline so the line doesn't get overwritten when running `./nodebb upgrade`

* Optimizations for custom homepage

Move it into a separate module
2017-11-04 10:51:44 -04:00
Barış Soner Uşaklı
760c061b1d closes #5993 2017-11-03 14:23:34 -04:00
Barış Soner Uşaklı
4551ee4768 some more tests 2017-11-03 13:25:43 -04:00
Barış Soner Uşaklı
662f92a4a8 supply callback to req.session.destroy 2017-11-02 18:21:25 -04:00
Julian Lam
7e0d0e0eb5 Merge remote-tracking branch 'origin/develop' 2017-11-02 14:13:48 -04:00
Barış Soner Uşaklı
5b2a674a4f closes #6020 2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
d5d6748c71 closes #6013 2017-10-30 20:20:14 -04:00
Baris Usakli
47143a4a09 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-10-30 15:29:26 -04:00
Baris Usakli
a500e0019c closes #6005 2017-10-30 15:26:17 -04:00
Barış Soner Uşaklı
41fbf7117d Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-10-25 18:21:54 -04:00
Barış Soner Uşaklı
a73c2628c4 cache improvements, stats 2017-10-25 18:20:44 -04:00
Peter Jaszkowiak
62ae171432 Merge remote-tracking branch 'origin/master' into develop 2017-10-23 17:13:35 -06:00
Barış Soner Uşaklı
6a2019c646 closes #6003 2017-10-23 19:05:00 -04:00
Barış Soner Uşaklı
e7318a1cea Mongo cache (#6002)
* cache mongodb objects

remove user settings cache since it is cached at the object level

* removed indexOf from isMemberOfSets

* change has to get, change maxAge to 0
2017-10-23 18:31:16 -04:00
Baris Usakli
c4310395c9 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
2017-10-19 13:54:56 -04:00
Baris Usakli
19dc7da42f closes #5994 2017-10-19 13:53:05 -04:00
Barış Soner Uşaklı
5e6d8ea566 handle 404 first 2017-10-14 08:34:04 -04:00
Peter Jaszkowiak
46fafb20b9 Remove string.js dependency 2017-10-13 21:02:41 -06:00
Baris Usakli
500c978a26 closes #5944 2017-10-12 13:03:43 -04:00
Julian Lam
72502ff992 utilising whitelist instead of blacklisting javascript protocol 2017-10-10 11:48:06 -04:00
Julian Lam
5863d64d27 prevent inline js payloads from executing in outgoing page 2017-10-10 11:35:17 -04:00
Barış Soner Uşaklı
67ba6bb820 closes #5977 2017-10-10 11:26:41 -04:00
Barış Soner Uşaklı
9e9de2edd0 closes #5976 2017-10-10 11:01:16 -04:00
Julian Lam
6852c92ed6 Merge remote-tracking branch 'origin/develop' 2017-10-03 13:37:43 -04:00
RoiEX
1fd160a4e6 Add Support for Firefox OSD 2017-10-03 09:43:33 -04:00
Peter Jaszkowiak
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
2017-10-02 09:24:27 -04:00
Peter Jaszkowiak
dc87d7fc0f Use .js instead of .jst
Fix #5934
2017-09-23 12:51:20 -06:00
Barış Soner Uşaklı
f989988178 closes #1668 2017-09-22 10:26:03 -04:00
Baris Usakli
852396e60d closes #5903 2017-09-21 13:50:24 -04:00
Julian Lam
8b0e6611d9 fixed incorrect parameter passed into hook 2017-09-12 18:55:47 -04:00
Julian Lam
9f4e92fa13 closes #5925 2017-09-12 13:46:51 -04:00
Julian Lam
38a7030639 Revert "Merge pull request #5923 from NodeBB/patch-5922"
This reverts commit f8ddabc884, reversing
changes made to 4976d13013.
2017-09-11 15:37:18 -04:00
Peter Jaszkowiak
f40d37ad48 Fix #5922 2017-09-08 13:23:30 -06:00
Baris Usakli
1358a89305 closes #5907 2017-09-01 18:40:34 -04:00
Peter Jaszkowiak
23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
2017-08-30 14:26:41 -06:00
Barış Soner Uşaklı
5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
2017-08-24 19:29:15 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Julian Lam
81cf8f77d3 add blacklist test to onSuccessfulLogin as well 2017-08-23 12:14:14 -04:00
Barış Soner Uşaklı
fcce96efab style change 2017-08-21 16:51:42 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5344edc2a7 closes #5885 2017-08-18 20:08:19 -04:00
Baris Usakli
dc9b21021a escape moderation notes 2017-08-18 11:23:20 -04:00