Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-01-26 09:09:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,590 Commits 4 Branches 0 Tags
00a3e9562588334d7ca83aa770e25985fe6a65a9
Commit Graph

150 Commits

Author SHA1 Message Date
OldHawk
c06754152f fix(users): fix restore password mail send issues 2017-10-22 02:17:07 +08:00
OldHawk
048d905006 fix(users): fix restore password mail send issues 2017-10-22 02:14:55 +08:00
OldHawk
34f5a5dc61 fix(users): fix restore password mail send issues 2017-10-22 02:12:38 +08:00
OldHawk
701f736082 fix(users): fix restore password mail send issues 2017-10-22 02:06:43 +08:00
OldHawk
c98ac2e301 test(users): send restore password mail 2017-10-22 01:58:47 +08:00
OldHawk
ea69331ea5 fix(users): fix restore password mail send issues 2017-10-22 01:49:53 +08:00
OldHawk
d3a7861b71 feat(about): add user rating for maker group 2017-10-20 23:17:36 +08:00
OldHawk
5b8dfa8e71 fix(users): console.log => meDebug 2017-10-20 23:16:52 +08:00
OldHawk
18f3af75cb feat(maker): admin oper can create maker group for user now, in user manager page 2017-10-19 18:44:22 +08:00
OldHawk
4c7d0535b2 fix(users): fixed first install meanTorrent and first register user`s admin roles 2017-10-19 10:33:40 +08:00
OldHawk
685697af20 feat(vip): admin can update user`s vip data 2017-10-17 16:32:56 +08:00
OldHawk
63b3ebacea feat(uses): admin list pagination 2017-10-14 23:15:53 +08:00
OldHawk
5052db968f feat(users): admin/oper can reset user`s profile image to default 2017-10-13 19:34:42 +08:00
OldHawk
c3149302a0 Merge commit '84ec1c80d283cbea8b186629e7b1de49d91cf9ba' 
* commit '84ec1c80d283cbea8b186629e7b1de49d91cf9ba':
  fix(heroku): fix invalid app.json (#1901)
  feat(deps): dependencies upgrade (#1887)
  release(0.6.0): MEAN.JS 0.6.0 (#1863)
  feat(readme): Deploy to Heroku button (#1854)
  fix(users): Spacing Issues
  Abstracted OAuth routes to use req param to identify strategy & moved scope to actual strategy definition.
  Save profile images to Amazon S3 (#1857)
  fix(build): Require correct dependencies for prod build (#1855)
  fix(eslint): Make `space-before-function-paren` rule consistent with other rules (#1858)
  fix(gulpfile): show error on uglify (#1860)
  feat(core): Add manifest.json (#1851)

# Conflicts:
#	CHANGELOG.md
#	README.md
#	modules/core/client/views/header.client.view.html
#	modules/users/client/views/settings/change-profile-picture.client.view.html
#	modules/users/server/controllers/users/users.profile.server.controller.js
#	package.json
 2017-10-13 15:43:39 +08:00
mleanos
fabccc850b fix(users): Spacing Issues 
Fixes spacing issues with a couple server-side user module files.
 2017-09-19 14:31:36 -07:00
Douglas Logan
6377a1ec6a Abstracted OAuth routes to use req param to identify strategy & moved scope to actual strategy definition. 2017-09-19 14:31:35 -07:00
Ghalleb
f146cbc4b2 Save profile images to Amazon S3 (#1857) 
* Profile Image to S3

* Delete image from S3
Fix file deletion

* S3 refactoring
 2017-09-19 13:47:41 -07:00
OldHawk
a175308b52 feat(users): add fields 'isVip, isOper, isAdmin' to model user 2017-09-14 15:18:14 +08:00
OldHawk
674209ebf9 feat(users): populate invited_by user info when login 2017-09-13 18:29:15 +08:00
OldHawk
ac5e453f05 fix(users): login error 2017-09-13 18:15:39 +08:00
OldHawk
201d54d18a feat(users): show invited_by user info in account status center and admin manage page 2017-09-13 15:05:28 +08:00
OldHawk
09f1fbbb3b feat(users): add invited_by filed to model user 2017-09-13 14:54:58 +08:00
OldHawk
7fcc8479e8 feat(debug): add app configure item of debug mode to show debug console log message 2017-09-13 10:51:52 +08:00
OldHawk
2b2bdc1dd4 feat(admin): add fields uptotal of users to count the uploaded torrent file numbers and get uptotal method 2017-09-12 10:53:42 +08:00
OldHawk
bcba926df2 feat(admin): admin can list user`s seeding/leeching/warning torrents 2017-09-11 18:15:46 +08:00
OldHawk
91bec12382 feat(users): show user h&r warning numbers in header menu and user info page 2017-09-11 15:12:21 +08:00
OldHawk
8dec0dff66 feat(users): add fields 'hnr_warning' to count H&R warning number 2017-09-07 16:44:13 +08:00
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
Mikael Korpela
f44c9bce71 fix(eslint): Inconsistent spacing before function parentheses (#1844) 
Defines `space-before-function-paren` eslint rule and changes files accordingly.
 2017-08-14 23:50:33 +03:00
Michael Leanos
eb9cdd784c feat(config): Mongo Seed 2.0 (#1808) 
feat(config): Mongo Seed 2.0

Adds a more configurable and easily extended MongoDB Seed feature.

Adds additional options at the collection, and collection item level to
allow more control over how each environment config handles the seeding
feature.

Enforces seed order based on the order of the  environment's seeding configuration object.

Removes the previous SeedDB config file.

Adds chalk to messages logged to the console for readability.

Refactors the Mongo Seed configuration tests.

Adds Gulp tasks to perform Mongo Seed operations for default, prod, and
test environment configurations. Also, adds accommodating npm scripts.
 2017-08-13 16:29:47 -07:00
Mikael Korpela
be88a2ca1f fix(users): don't fail on missing old image on image upload (#1839) 
Fixes scenarios where previously when old image file would be missing, uploading new image file over it would fail because unlinking previous file fails.
 2017-08-13 21:52:38 +03:00
Mikael Korpela
f65d4b90ca feat(user): Add email support to forgot password (#1834) 
Adds support for recovering users account using email and username.

Previously only username worked.
 2017-08-07 16:38:48 +03:00
Michael Leanos
dc880eb5a7 feat(config): Mongoose 4.11 upgrade (#1818) 
Upgrades Mongoose to 4.11.1

Updates Mongoose connection implementation to accommodate deprecated
features & connection options.

Also, updates the Gulp Mocha tasks to reflect changes to the Mongoose
implementation.

Fixes tests to get the database from the existing Mongoose singleton.

Derives from changes in https://github.com/meanjs/mean/pull/1816

Closes https://github.com/meanjs/mean/issues/1814
 2017-07-27 13:19:22 -07:00
OldHawk
0fbed06b1a Merge commit '11777465cf77e2a0bbd0d576a1dadd76a8c2f55d' 
* commit '11777465cf77e2a0bbd0d576a1dadd76a8c2f55d':
  Update templateCache root path
  feat(packages): updating packages (#1819)
  feat(Karma): Add mocha style progress to Karma tests
  feat(Travis): Don't allow Node.js 8 testing fail (#1815)
  feat(dependencies): replace PhantomJS in favor of chrome (#1776)
  fix(security): updated compression lib in package.json to reduce vulnerabilities (#1812)
  fix(build): ESLint error in Express config (#1807)
  fix(security): updating vulnerable packages (#1802)
  fix(build): E2E coverage broken on Travis CI (#1805)
  fix(users): Domain config setting (#1803)

# Conflicts:
#	package.json
 2017-07-21 18:09:46 +08:00
OldHawk
9a43f8d052 feat(users): add access of user to view UserInfo 2017-07-17 20:13:56 +08:00
OldHawk
355307d21b fix(forums): update user topic & reply count when +/- 2017-07-16 14:44:22 +08:00
OldHawk
909b35ee60 feat(users): forbid user login when banned from server 2017-07-04 17:52:08 +08:00
OldHawk
9ea721ec29 feat(users): forbid user login when banned from server 2017-07-04 17:49:11 +08:00
OldHawk
a256d60064 feat(users): forbid user login when banned from server 2017-07-04 17:47:25 +08:00
OldHawk
65bb420363 fix(user): count ratio error when mongo update event 2017-06-29 18:15:00 +08:00
Michael Leanos
0cbdbdafb7 fix(users): Domain config setting (#1803) 
Fixes an incorrect reference to the application's Domain configuration
setting.
 2017-06-28 15:12:15 -07:00
OldHawk
d809b6262f feat(traces): load traces data 2017-06-24 13:53:32 +08:00
OldHawk
025d40e7f5 feat(traces): trace log many admin and user action 2017-06-24 12:36:28 +08:00
OldHawk
dbba4c0d64 feat(users): add filter to show ratio formated info 2017-06-21 09:58:27 +08:00
OldHawk
418f7fa5cc fix(core): upgrade conflict 2017-06-19 13:06:59 +08:00
OldHawk
4596c91d8c Merge commit '8f50eecc7c1ec7dda3363093b3b3e7f17ca9a692' 
# Conflicts:
#	modules/users/server/controllers/users/users.authentication.server.controller.js
#	package.json
 2017-06-19 12:43:44 +08:00
OldHawk
ba46261f6a fix(users): toJSON roles null error 2017-06-18 18:01:50 +08:00
OldHawk
a50da22141 feat(invitation): show user info by invite mail on detail page 2017-06-15 16:57:14 +08:00
OldHawk
30bd5169d7 feat(invitation): user can sign up by invitation mail now!!!!! 2017-06-15 16:18:07 +08:00
Michael Leanos
e4a3d38b23 fix(users): Duplicate Provider Accounts (#1767) 
Fixes an issue where a provider account could be added to the logged in
user's additionalProviderData, when another user has already connected
that same account.

Refactors the saveOAuthUserProfile method to consider the results of the
provider search query, whether or not the current user is logged in.
 2017-06-11 00:21:26 -07:00