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

..

admin.js

Merge branch 'master' into develop

2017-03-06 09:51:11 -05:00

approval.js

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

2017-07-28 14:19:09 -04:00

auth.js

use direct db call to get rss_token instead

2017-07-05 11:41:23 -04:00

bans.js

closes #5692

2017-05-19 14:52:36 -04:00

categories.js

style changes

2017-05-26 00:02:20 -04:00

create.js

refactor for sendValidationEmail, and sending better dummy data for welcome email template

2017-05-30 13:09:30 -04:00

data.js

closes #5845

2017-08-01 14:09:55 -04:00

delete.js

use _.uniq

2017-06-25 20:00:05 -04:00

digest.js

added default payload to emails, and adding nodebb logo for email header

2017-07-13 11:30:44 -04:00

email.js

added default payload to emails, and adding nodebb logo for email header

2017-07-13 11:30:44 -04:00

follow.js

more notification tests

2017-05-20 22:30:12 -04:00

info.js

Switch from underscore to lodash

2017-05-27 14:51:45 -06:00

invite.js

fixed missing payload items in invitation email

2017-07-14 15:50:59 -04:00

jobs.js

fix calls

2017-05-31 13:13:16 -04:00

notifications.js

remove unnecessary checks

2017-05-27 00:47:04 -04:00

online.js

more refactors

2017-03-02 16:11:11 +03:00

password.js

style changes

2017-05-26 00:02:20 -04:00

picture.js

style changes

2017-05-26 00:02:20 -04:00

posts.js

style changes

2017-05-26 00:02:20 -04:00

profile.js

proof of concept for #5740

2017-06-20 16:12:55 -04:00

reset.js

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

2017-08-11 11:33:06 -04:00

search.js

group member search change

2017-07-28 00:55:02 -04:00

settings.js

add filter:user.saveSettings

2017-07-26 16:30:08 -04:00

topics.js

ESlint padded-blocks

2017-02-18 02:32:24 -07:00