Commit Graph

9045 Commits

Author SHA1 Message Date
Julian Lam
bc6364f4c0 fixed #6082 2017-11-17 12:00:43 -05:00
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
Barış Soner Uşaklı
c839d1cbc0 closes #6080 closes #6078 2017-11-17 08:10:25 -05:00
aStonedPenguin
610a1c943f Add unread-class to category children (#6071)
* Add unread-class to category children

* unused variables

* Move child unread-class to a better place

* comma?

¯\_(ツ)_/¯

* feedback
2017-11-16 18:40:39 -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
Peter Jaszkowiak
f5385e38bf Add /me* route which redirects to /user/[userslug]* (#6063)
* Add `/me*` route which redirects to the current user's information

- `/me` -> `/user/[usertslug]`
- `/me/bookmarks` -> `/user/[userslug]/bookmarks`
- `/me/settings` -> `/user/[userslug]/settings`

etc

* Add tests for `/me/*`
2017-11-16 17:38:26 -05:00
Barış Soner Uşaklı
5da24b4120 https://github.com/NodeBB/NodeBB/issues/6073 2017-11-16 10:55:59 -05:00
Julian Lam
321998dd4f Merge branch 'develop' 2017-11-16 10:11:20 -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
9e5a8856d1 fix wrong sorting option in acp 2017-11-15 14:01:20 -05:00
Baris Usakli
30ae0a5499 another process.nextTick 2017-11-15 13:06:23 -05:00
Baris Usakli
e187a0def2 fix method name 2017-11-15 11:50:44 -05:00
Baris Usakli
12546cb9ad break up sync operation 2017-11-15 11:35:25 -05:00
yariplus
7ac01b4c06 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/6 Fixes https://github.com/NodeBB/nodebb-rewards-essentials/issues/11 2017-11-14 14:11:25 -05:00
Barış Soner Uşaklı
67bc58f04c wait for state to be updated 2017-11-12 08:45:08 -05:00
Barış Soner Uşaklı
b6211fdc04 closes #6053 2017-11-10 10:20:47 -05:00
Barış Soner Uşaklı
6c755869cd add back missing onSettingsLoaded 2017-11-09 14:24:47 -05:00
Baris Usakli
5604c62776 use the first set for sorting 2017-11-08 16:32:34 -05:00
Baris Usakli
4fdc1b99c6 remove unnecessary variable 2017-11-08 16:32:16 -05:00
Baris Usakli
eeedba697b closes #5804 2017-11-08 14:06:52 -05:00
Barış Soner Uşaklı
b1ea137292 closes #6046 2017-11-07 12:39:34 -05:00
acardinale
5ed6b5c414 Add User (uid) Welcome Notification (#6045) 2017-11-07 09:17:27 -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
Barış Soner Uşaklı
fae8ee83e8 closes #6039 2017-11-05 09:54:59 -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
Julian Lam
766f94745f updated bootstrap and bootswatch css on installer template, closes #6033 2017-11-03 11:29:06 -04:00
Barış Soner Uşaklı
845f01f297 dont set meta.config to null 2017-11-02 18:39:36 -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
Peter Jaszkowiak
dfad76120d Support npm@5 and yarn (#6010)
* Support npm@5 and yarn

Use package.default.json
Partial #6008

- Overwrite package.json with package.default.json values
- `dependencies` field is merged with package.default.json version taking precidence
- `./nodebb upgrade` automatically does those things and runs `git pull`
- use `./nodebb upgrade --dev` to avoid the `git pull`

* added logic to preserve extraneous plugins installed in node_modules/

* Don't automatically git pull

* Simplify package-install, run it on upgrade just in case
2017-11-02 14:12:05 -04:00
Barış Soner Uşaklı
008f757a9b closes #6030 2017-11-02 13:16:07 -04:00
Barış Soner Uşaklı
54a84bf130 cache fixes 2017-11-02 12:56:44 -04:00
Barış Soner Uşaklı
43f9c3224f dont crash sortedSetIncryBy on redis if no callback is supplied 2017-11-02 08:14:35 -04:00
Peter Jaszkowiak
e609e497b3 Provide more error information to logs
Provides full stack instead of just message
2017-11-01 18:59:48 -06:00
Peter Jaszkowiak
ec38b18e34 Always compare password with a hash
Prevents quick response when user / email doesn't exist
2017-11-01 18:57:52 -06:00
Baris Usakli
e3a7649290 closes #6027 2017-11-01 12:31:15 -04:00
Peter Jaszkowiak
adc47fd053 Use relative linking (#6011)
* Use relative linking

* Add copyFile method and tests

Closes #5988

* Fix relative linking on Windows

Hard links and junctions don't work with relative paths

* Fix tests

* Revert ghange to gitignore
2017-10-31 22:18:15 -04:00
Barış Soner Uşaklı
18f4f27fe0 closes #6024 2017-10-31 18:03:54 -04:00
Barış Soner Uşaklı
5b2a674a4f closes #6020 2017-10-31 16:04:25 -04:00
Barış Soner Uşaklı
25cd21fba8 closes #6019 2017-10-31 10:53:28 -04:00
Barış Soner Uşaklı
6b1af76f08 closes #6015 2017-10-31 09:43:11 -04:00
Barış Soner Uşaklı
3c45b3edb6 string is removed on develop 2017-10-31 09:04:07 -04:00
Barış Soner Uşaklı
d5d6748c71 closes #6013 2017-10-30 20:20:14 -04:00
Baris Usakli
43bec4cb45 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-10-30 17:08:16 -04:00
Baris Usakli
6778cce265 add new zset 2017-10-30 17:07:51 -04:00