OldHawk f052ea853e Merge commit 'b43c80e2c097b11114f4e4f01b9718321721a89b' ...

* commit 'b43c80e2c097b11114f4e4f01b9718321721a89b':
  feat(build): Update dependencies (#1847)
  fix(travis): Fix Travis failing on webdriver issues (#1845)
  fix(eslint): Inconsistent spacing before function parentheses (#1844)
  fix(mongodb): update ssl connection settings (#1809)
  Remove deprecated crypto package (#1843)
  feat(config): Mongo Seed 2.0 (#1808)
  fix(users): don't fail on missing old image on image upload (#1839)
  feat(build): Turn on mangling for uglify (#1841)
  fix(gulp): fix broken test:server:watch task (#1842)
  feat(core): Enhancement page title directive (#1686)
  feat(user): Add email support to forgot password (#1834)
  fix(mocha): update mochajs version to reduce vulnerabilities (#1830)
  refactor(menus): Refactor to the Menus client service to use functional loops/filters (#1575)
  feat(config): Mongoose 4.11 upgrade (#1818)

# Conflicts:
#	config/env/development.js
#	config/lib/app.js
#	modules/articles/server/models/article.server.model.js
#	modules/chat/client/config/chat.client.routes.js
#	modules/core/client/directives/page-title.client.directive.js
#	modules/core/client/services/menu.client.service.js
#	modules/users/client/config/users-admin.client.routes.js
#	modules/users/client/views/password/forgot-password.client.view.html
#	modules/users/server/models/user.server.model.js
#	package.json

2017-08-22 13:35:29 +08:00

..

config

Merge commit 'b43c80e2c097b11114f4e4f01b9718321721a89b'

2017-08-22 13:35:29 +08:00

controllers

fix(eslint): Inconsistent spacing before function parentheses (#1844)

2017-08-14 23:50:33 +03:00

services

fix(core): Remove the <base> tag.

2016-10-10 16:05:10 -07:00

views

change views class => container

2017-04-01 14:38:42 +08:00

articles.client.module.js

feat(articles): Article Admin feature (#807)

2016-07-25 17:34:06 -07:00