Commit Graph

362 Commits

Author SHA1 Message Date
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
OldHawk
268d19801a fix(core): sign up tip string 2017-10-13 11:51:05 +08:00
OldHawk
7a407dae29 feat(core): show other type torrents in home page 2017-10-12 15:34:03 +08:00
OldHawk
7e8f2021df fix(core): fixed some route role 2017-10-11 15:21:42 +08:00
OldHawk
f8e8a4c6ba feat(torrents): torrent logo showed logic 2017-10-10 14:16:29 +08:00
OldHawk
5d612a10b5 feat(torrents): optimization showed torrent info 2017-10-06 11:36:27 +08:00
OldHawk
e119f19470 feat(torrents): add music torrent MTV flag 2017-10-05 02:29:31 +08:00
OldHawk
598987d2d7 feat(torrents): show topOne music info at home page 2017-10-03 00:24:49 +08:00
OldHawk
9515a0fc4f feat(torrents): new TorrentGetInfoServices to get field value of torrent 2017-09-30 11:29:23 +08:00
OldHawk
601d6c5245 feat(torrents): remove some unnecessary css style 2017-09-29 18:34:48 +08:00
OldHawk
8b254310fc feat(torrents): add music-disk status in user account center and admin manage page 2017-09-29 15:14:38 +08:00
OldHawk
59edec3910 feat(torrents): show vip torrent flag in every list page 2017-09-21 13:37:47 +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
ba1835b33e feat(users): filter isVip, isAdmin, isOper in admin users manager page 2017-09-19 13:35:00 +08:00
OldHawk
b1cff72150 fix(core): fixed some css 2017-09-18 16:17:38 +08:00
OldHawk
4f0db2e2fe fix(core): change search input css on all page 2017-09-18 14:12:33 +08:00
OldHawk
95a201ce7c feat(users): add mt-responsive-tabs-* css class for nav-tabs 2017-09-18 13:50:34 +08:00
OldHawk
042bb6380b feat(users): add mt-responsive-tabs-* css class for nav-tabs 2017-09-18 13:06:30 +08:00
OldHawk
8dd996c657 chg(all): change all torrents list page download button ui 2017-09-15 17:23:45 +08:00
OldHawk
1daa5a07cf chg(all): change all torrents list page td size 2017-09-15 15:19:29 +08:00
OldHawk
1773fdf613 feat(users): show user VIP flag 2017-09-14 16:11:11 +08:00
OldHawk
a175308b52 feat(users): add fields 'isVip, isOper, isAdmin' to model user 2017-09-14 15:18:14 +08:00
OldHawk
74b8334d4c feat(invitations): add directive of vipFlag to show user`s VIP flag 2017-09-14 14:42:56 +08:00
OldHawk
09c1a31ac5 feat(invitations): show VIP flag in account status 2017-09-14 14:02:52 +08:00
OldHawk
a2be173405 feat(invitations): show ok message when user has no any H&R warning 2017-09-14 12:08:20 +08:00
OldHawk
fde647cd2b feat(invitations): add prop 'info-uname' into directives 'user-info' 2017-09-14 11:41:03 +08:00
OldHawk
674209ebf9 feat(users): populate invited_by user info when login 2017-09-13 18:29:15 +08:00
OldHawk
77f3765d0c fix(users): invited_by info bug 2017-09-13 18:16:33 +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
f639409a87 feat(debug): add debuginfo client service, hide or show console.log 2017-09-13 13:27:34 +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
864fdcf5db fix(H&R): remove h&r warning with score 2017-09-12 18:07:35 +08:00
OldHawk
cd91ff774f feat(H&R): show H&R warning tooltip info in user account status page 2017-09-12 18:02:28 +08:00
OldHawk
7d0a2eaf9f feat(H&R): show H&R warning tooltip info in list page 2017-09-12 17:47:33 +08:00
OldHawk
19328c205c feat(H&R): user can remove warning with score number, admin and oper can remove warning too. 2017-09-12 17:07:12 +08:00
OldHawk
96a46b6b59 feat(log): console.log debug info 2017-09-12 11:59:49 +08:00
OldHawk
a047e12cfd fix(HnR): show h&r tag in user account center 2017-09-12 11:49:08 +08:00
OldHawk
4a8bac4544 feat(users): admin/oper list user uploaded torrent detail list 2017-09-12 11:22:35 +08:00
OldHawk
16c0035a31 feat(users): show uploaded torrent files number in admin manage page 2017-09-12 11:08:41 +08:00
OldHawk
0aec8e3245 feat(users): show uploaded torrent files number in userinfo page 2017-09-12 11:08:26 +08:00
OldHawk
05e0ab330f feat(users): show uploaded torrent files number in account status page 2017-09-12 11:05:32 +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
3302bf478d feat(admin): show detail list when user seed/leech/warning torrents count more than 0 2017-09-12 10:52:01 +08:00
OldHawk
674d31fd9b feat(admin): add count number of seeding/leeching/warning torrent in admin list page 2017-09-11 18:20:10 +08:00
OldHawk
bcba926df2 feat(admin): admin can list user`s seeding/leeching/warning torrents 2017-09-11 18:15:46 +08:00
OldHawk
5648072557 feat(admin): nav to admin user manage page on userinfo detail 2017-09-11 16:47:02 +08:00