Julian Lam 2fd4edc0e2 Merge branch 'develop' into upgrades-refactor

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

..

admin

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

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

categories

running eslint again

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

controllers

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

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

database

closes #5517

2017-03-10 12:22:10 +03:00

groups

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

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

messaging

fix newSet on redis

2017-03-08 15:09:58 +03:00

meta

Merge branch 'master' into develop

2017-03-07 14:35:49 -05:00

middleware

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

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

navigation

Resolve merge conflicts, minify only .js files

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

plugins

Merge branch 'master' into develop

2017-02-28 12:07:56 -05:00

posts

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

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

privileges

Merge branch 'master' into develop

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

rewards

Merge branch 'master' into develop

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

routes

Merge branch 'master' into develop

2017-03-07 14:35:49 -05:00

socket.io

#5513 (#5520)

2017-03-10 12:50:19 -05:00

topics

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

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

upgrades

Merge branch 'develop' into upgrades-refactor

2017-03-01 11:11:40 -05:00

user

fix merge conflict artifact that was left in

2017-03-06 09:58:02 -05:00

views

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

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

widgets

ESlint object-curly-spacing

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

analytics.js

Merge branch 'master' into develop

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

batch.js

ESlint operator-assignment, block-scoped-var

2017-02-18 14:20:58 -07:00

categories.js

ESlint object-curly-spacing

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

coverPhoto.js

ESlint operator-assignment, block-scoped-var

2017-02-18 14:20:58 -07:00

database.js

ESlint eol-last

2017-02-18 02:30:48 -07:00

emailer.js

ESlint no-multi-assign

2017-02-18 18:06:28 -07:00

emitter.js

ESlint eol-last

2017-02-18 02:30:48 -07:00

events.js

ESlint no-multi-assign

2017-02-18 18:06:28 -07:00

file.js

more linting

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

flags.js

more linting

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

groups.js

some more refactors

2017-03-02 17:25:32 +03:00

hotswap.js

ESlint eol-last

2017-02-18 02:30:48 -07:00

image.js

Resolve merge conflicts, minify only .js files

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

install.js

adjusted upgrade check logic for instances with no schemaLog

2017-02-26 16:26:53 -05:00

languages.js

Fix empty lines in language selectors

2017-01-19 19:07:53 -07:00

logger.js

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

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

messaging.js

fix newSet on redis

2017-03-08 15:09:58 +03:00

meta.js

Refactor Code

2017-03-06 20:07:06 +01:00

notifications.js

Merge branch 'master' into develop

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

pagination.js

fix test

2017-03-07 20:58:43 +03:00

password.js

ESlint object-curly-spacing

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

plugins.js

Merge branch 'master' into develop

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

posts.js

posts:votes sorted set

2017-02-27 15:27:07 -05:00

privileges.js

ESlint quotes

2017-02-18 01:56:23 -07:00

pubsub.js

closes #5465, blacklist tests

2017-02-22 14:53:44 +03:00

reset.js

ESlint no-unused-vars

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

search.js

Merge branch 'master' into develop

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

settings.js

ESlint no-cond-assign, no-void, valid-jsdoc

2017-02-18 13:51:26 -07:00

sitemap.js

ESlint object-curly-spacing

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

social.js

ESlint eol-last

2017-02-18 02:30:48 -07:00

start.js

added upgrade.check back into upgrade.js

2017-02-26 15:53:25 -05:00

topics.js

refactor deleter code to use unixtimestamp

2017-03-10 22:22:08 +03:00

upgrade.js

Merge branch 'develop' into upgrades-refactor

2017-03-01 12:12:04 -05:00

user.js

holy moly it took me an hour to find this missing method that got removed in a bad merge conflict resolution...

2017-03-07 20:16:59 -05:00

webserver.js

Merge branch 'master' into develop

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