Commit Graph

3433 Commits

Author SHA1 Message Date
OldHawk
50e5edcaf4 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  feat(forums): hide forum category if it has not any sub forums
  chg(about): change black.client.view css
  feat(about): assign about.rules and about.click_black access to registered and login user.
  feat(forums): hide forum category if it has not any sub forums
2018-03-11 17:41:29 +08:00
OldHawk
fc7ac99692 Merge commit '69ca3e2a6a4d7fb9d7b3bbeed35d8a56caf1daf9'
* commit '69ca3e2a6a4d7fb9d7b3bbeed35d8a56caf1daf9':
  feat(forums): hide forum category if it has not any sub forums
2018-03-11 17:40:04 +08:00
OldHawk
69ca3e2a6a feat(forums): hide forum category if it has not any sub forums 2018-03-11 17:38:26 +08:00
OldHawk
528a4f878b Merge commit 'a84312f7279f9837b1c60a3758e72b6f9fa39fec'
* commit 'a84312f7279f9837b1c60a3758e72b6f9fa39fec':
  cfg(core): config global HOST settings

# Conflicts:
#	config/env/torrents.js
2018-03-11 17:32:53 +08:00
OldHawk
d38dc4005f chg(about): change black.client.view css 2018-03-11 17:26:04 +08:00
OldHawk
0a6f190432 feat(about): assign about.rules and about.click_black access to registered and login user. 2018-03-11 17:24:11 +08:00
OldHawk
c33c826684 feat(forums): hide forum category if it has not any sub forums 2018-03-11 17:19:45 +08:00
OldHawk
d17bb6726d Merge commit 'a84312f7279f9837b1c60a3758e72b6f9fa39fec'
* commit 'a84312f7279f9837b1c60a3758e72b6f9fa39fec':
  cfg(core): config global HOST settings

# Conflicts:
#	config/env/torrents.js
2018-03-08 11:49:11 +08:00
OldHawk
30f0b3095c cfg(core): config global settings for demo 2018-03-08 11:26:33 +08:00
OldHawk
46f1fc84c3 cfg(core): config global settings for demo 2018-03-08 11:24:34 +08:00
OldHawk
d9e96fc310 cfg(core): config global settings for demo 2018-03-08 11:23:42 +08:00
OldHawk
a84312f727 cfg(core): config global HOST settings 2018-03-08 11:13:17 +08:00
OldHawk
214744f65b cfg(core): config global settings for demo 2018-03-08 11:10:30 +08:00
OldHawk
cd3c98ec37 chg(vip): disable payment event 2018-03-07 17:48:27 +08:00
OldHawk
8bf87c10b8 cfg(core): config global SIGN settings 2018-03-07 17:39:23 +08:00
OldHawk
9750c4e46d cfg(core): config global HOST settings 2018-03-07 17:13:27 +08:00
OldHawk
467ac1375f Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  cfg(core): config global HOST settings
2018-03-07 17:12:10 +08:00
OldHawk
1a097591fb cfg(core): config global HOST settings 2018-03-07 17:10:09 +08:00
OldHawk
381be52a3f Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  cfg(core): config global HOST settings
2018-03-07 17:08:52 +08:00
OldHawk
8db238578c cfg(core): config global HOST settings 2018-03-07 17:02:08 +08:00
OldHawk
221e379100 conf(config): config settings for hello.pt 2018-03-07 16:49:37 +08:00
OldHawk
821042da80 Merge commit 'fc06cdbd9511a3c0787f393165c0c0ba83641dcd'
* commit 'fc06cdbd9511a3c0787f393165c0c0ba83641dcd':
  cfg(core): config global settings
  cfg(core): config global settings

# Conflicts:
#	config/env/default.js
#	config/env/development.js
#	config/env/production.js
#	config/env/torrents.js
2018-03-07 16:48:52 +08:00
OldHawk
0c6fa0d919 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  cfg(core): config global settings
2018-03-07 16:30:15 +08:00
OldHawk
fc06cdbd95 cfg(core): config global settings 2018-03-07 16:25:42 +08:00
OldHawk
6d71c69ae7 Merge commit '8b6882b614c326080d3738508f630f84cb7e9646'
* commit '8b6882b614c326080d3738508f630f84cb7e9646':
  cfg(core): config global settings
2018-03-07 16:16:57 +08:00
OldHawk
8b6882b614 cfg(core): config global settings 2018-03-07 15:39:57 +08:00
OldHawk
fefbc86652 doc(readme): update readme.md 2018-03-07 15:14:27 +08:00
OldHawk
a863f82591 conf(config): config settings for hello.pt 2018-03-07 12:42:05 +08:00
OldHawk
b9d6548648 conf(config): config settings for hello.pt 2018-03-07 12:36:37 +08:00
OldHawk
4c028a226d doc(readme): update readme.md 2018-03-07 11:58:42 +08:00
OldHawk
e9cded0496 add ignored file 2018-03-07 11:48:54 +08:00
OldHawk
073764d6a8 feat(core): add forever start shell cmd files. 2018-03-06 15:15:11 +08:00
OldHawk
ea8ee21152 feat(core): add forever start shell cmd files. 2018-03-06 14:12:01 +08:00
OldHawk
0ddaeb0404 doc(readme): update readme.md 2018-02-27 14:19:03 +08:00
OldHawk
4d1fa4a546 doc(readme): update readme.md 2018-02-02 16:34:26 +08:00
OldHawk
b06eddbaad feat(vip): add vip desc info on vip donate page 2018-02-02 16:17:27 +08:00
OldHawk
91f73b122c fix(examination): fixed examination uses list issue 2018-02-02 15:58:59 +08:00
OldHawk
c6de15963c fix(examination): fixed examination uses list index number 2018-02-02 15:54:09 +08:00
OldHawk
6353363c69 fix(examination): fixed translate string 2018-02-02 13:15:03 +08:00
OldHawk
f6fbc496f3 feat(examination): admin ban all examination unfinished users 2018-02-02 13:11:55 +08:00
OldHawk
aa627b7956 feat(examination): list examination status users 2018-02-02 12:16:05 +08:00
OldHawk
3aa6416893 feat(examination): add more detail link on examination notice msg 2018-02-01 17:04:40 +08:00
OldHawk
91515e94aa chg(announce): change score logic when announce 2018-02-01 15:49:28 +08:00
OldHawk
8acb2f573c fix(core): fixed examination status on home 2018-02-01 14:46:40 +08:00
OldHawk
424cbec663 fix(announce): fixed announce issue of download score 2018-02-01 14:41:18 +08:00
OldHawk
494f0ad63f fix(torrents): fixed examination score issue when announce 2018-02-01 13:34:54 +08:00
OldHawk
515adac274 fix(torrents): fixed examination data on home issue 2018-02-01 13:34:27 +08:00
OldHawk
3331a89dd0 fix(torrents): fixed thumbs up of torrent issue 2018-02-01 12:53:05 +08:00
OldHawk
f9755c68c6 chg(score): change some score operator logic to ready for examination 2018-02-01 11:51:39 +08:00
OldHawk
a748399a46 chg(score): change thumbs score config and update logic 2018-01-31 12:31:27 +08:00