Julian Lam 0e157d93ea Merge remote-tracking branch 'origin/master' into develop

2017-03-24 15:52:58 -04:00

..

database

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

files

closes #5459

2017-02-20 21:28:02 +03:00

helpers

fix tests for subfolder installs

2017-02-25 16:04:04 +03:00

mocks

ESlint no-useless-concat, no-mixed-spaces-and-tabs

2017-02-18 14:42:15 -07:00

.eslintrc

ESlint no-unused-vars

2017-02-18 15:05:36 -07:00

authentication.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

blacklist.js

Resolve merge conflicts, minify only .js files

2017-02-23 18:31:49 -07:00

build.js

Resolve merge conflicts, minify only .js files

2017-02-23 18:31:49 -07:00

categories.js

privileges tests

2017-03-03 21:04:01 +03:00

controllers-admin.js

privileges tests

2017-03-03 21:04:01 +03:00

controllers.js

added tests for #5545

2017-03-24 15:52:33 -04:00

database.js

ESlint padded-blocks

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

flags.js

more linting

2017-02-24 12:55:31 -05:00

groups.js

test for system group rename

2017-03-09 17:18:30 +03:00

messaging.js

Resolve merge conflicts, minify only .js files

2017-02-23 18:31:49 -07:00

meta.js

more admin socket tests

2017-02-28 15:16:49 +03:00

mocha.opts

Fix return and tests

2017-02-17 20:36:13 +00:00

notifications.js

closes #5527

2017-03-14 23:03:09 +03:00

pagination.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

plugins.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

posts.js

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

2017-03-10 15:44:29 -05:00

rewards.js

ESlint no-unused-vars

2017-02-18 15:05:36 -07:00

search-admin.js

ESlint indent

2017-02-18 02:38:03 -07:00

search.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

socket.io.js

Merge branch 'master' into develop

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

template-helpers.js

fix tests for subfolder installs

2017-02-25 16:04:04 +03:00

topics.js

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

2017-03-10 15:44:29 -05:00

translator.js

Merge branch 'master' into develop

2017-02-24 12:46:40 -05:00

uploads.js

Fix tests

2017-03-15 20:09:07 -07:00

user.js

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

2017-03-24 14:37:39 -04:00

utils.js

ESlint no-useless-escape, no-else-return

2017-02-18 14:27:26 -07:00