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

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

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

posts

fixed #5782

2017-06-28 11:20:57 -04:00

topics

style changes

2017-07-15 16:57:41 -04:00

user

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

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

admin.js

removed references to libs that aren't used

2017-07-17 12:40:50 -04:00

blacklist.js

style changes

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

categories.js

closes #5742

2017-06-06 16:40:32 -04:00

flags.js

style changes

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

groups.js

closes #5618

2017-05-27 23:58:12 -04:00

helpers.js

closes #5086

2017-08-02 13:45:00 -04:00

index.js

remove init socket.io

2017-06-02 17:18:58 -04:00

meta.js

ESlint comma-dangle

2017-02-17 19:31:21 -07:00

modules.js

more tests

2017-05-20 20:03:46 -04:00

notifications.js

closes #5754

2017-06-13 15:20:31 -04:00

plugins.js

style changes

2017-05-27 01:44:26 -04:00

posts.js

fixes logic that allowed posts beyond maximum post length if min is set to 0, @barisusakli

2017-06-28 12:25:51 -04:00

topics.js

more topic tests

2017-03-02 19:03:49 +03:00

user.js

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

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