Peter Jaszkowiak 360a35d0a6 Resolve merge conflicts

2017-02-02 22:15:26 -07:00

..

appearance.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

blacklist.js

closes #5316

2017-01-27 16:29:42 -05:00

cache.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

categories.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

dashboard.js

Update dashboard.js

2017-01-30 17:45:48 +01:00

database.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

errors.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

events.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

flags.js

ACP menu and title translations

2016-12-19 15:51:43 -05:00

groups.js

read req.uid instead of req.user.uid in admin groups list

2016-11-17 07:47:18 -05:00

homepage.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

info.js

gitInfo error doesnt block page

2016-11-04 20:02:24 +03:00

languages.js

Standard language codes (#5218)

2016-11-23 11:50:49 -05:00

logger.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

logs.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

navigation.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

plugins.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

rewards.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

settings.js

Use /assets for client assets

2017-01-14 22:38:40 -07:00

social.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

sounds.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

tags.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

themes.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00

uploads.js

Build pipeline improvements

2017-01-15 12:38:16 -07:00

users.js

fix eslint

2016-10-20 00:25:40 +03:00

widgets.js

Fix space-before-function-paren linter rule

2016-10-13 11:43:39 +02:00