Commit Graph

3246 Commits

Author SHA1 Message Date
OldHawk
a77af753a5 fix(vip): fixed common variable in rules file 2018-03-16 13:33:06 +08:00
OldHawk
6a98e48c13 feat(core): common variable settings of site_domain 2018-03-16 13:25:22 +08:00
OldHawk
22ca77808d Revert "feat(core): common variable settings value"
This reverts commit f1199a1de7.
2018-03-16 13:22:18 +08:00
OldHawk
ec3276d807 feat(core): common variable settings value of setDefaultValueOnIndex 2018-03-16 13:06:04 +08:00
OldHawk
f1199a1de7 feat(core): common variable settings value 2018-03-16 12:51:46 +08:00
OldHawk
0d57d83a76 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  feat(core): common variable settings value
  fix(core): remove comment lines.
  feat(core): common variable settings value
  feat(core): add new common variable configure file
  update readme.md

# Conflicts:
#	README.md
#	config/env/default.js
#	config/env/development.js
#	config/env/production.js
#	config/env/torrents.js
2018-03-16 12:49:55 +08:00
OldHawk
5eded508d4 feat(core): common variable settings value 2018-03-16 12:15:20 +08:00
OldHawk
fa0e673994 fix(core): remove comment lines. 2018-03-16 12:02:55 +08:00
OldHawk
c20b8e5528 feat(core): common variable settings value 2018-03-16 12:01:07 +08:00
OldHawk
9017e430b8 feat(core): add new common variable configure file 2018-03-16 11:57:30 +08:00
OldHawk
689517d95e update readme.md 2018-03-15 18:46:41 +08:00
OldHawk
d83e1b2edf Merge commit 'd5a8f6d4b786ce9227b40d0fc880c184bcaa7781'
* commit 'd5a8f6d4b786ce9227b40d0fc880c184bcaa7781':
  test
  doc(readme): update readme.md
  restore many files
  update readme.md

# Conflicts:
#	README.md
#	config/env/development.js
#	config/env/production.js
2018-03-15 18:38:12 +08:00
OldHawk
d5a8f6d4b7 test 2018-03-15 17:21:03 +08:00
OldHawk
e48a6f8ac5 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  doc(readme): update readme.md

# Conflicts:
#	README.md
2018-03-15 17:17:37 +08:00
OldHawk
f77f9627b4 doc(readme): update readme.md 2018-03-15 17:10:01 +08:00
OldHawk
c023a4ce34 update readme.md 2018-03-15 16:09:58 +08:00
OldHawk
bd594c5e1c Merge branch 'master' of https://github.com/taobataoma/hello.pt
* 'master' of https://github.com/taobataoma/hello.pt:
  fix(forums): oper only forums tooltip translate string
  update readme.md
  merge from meanTorrent
  add ignore
  add ignore

# Conflicts:
#	README.md
#	modules/about/client/templates/rules-en.md
2018-03-15 16:04:32 +08:00
OldHawk
cce2ba00e8 merge from meanTorrent 2018-03-15 15:56:38 +08:00
OldHawk
9471beef3b add ignore 2018-03-15 15:52:11 +08:00
OldHawk
279233395f add ignore 2018-03-15 15:52:11 +08:00
OldHawk
3efe15d620 restore many files 2018-03-15 15:34:56 +08:00
OldHawk
38bad46c16 update readme.md 2018-03-15 15:29:41 +08:00
OldHawk
defb7f11f7 doc(readme): restore readme.md 2018-03-15 15:14:08 +08:00
OldHawk
bb5d14cae9 doc(readme): restore readme.md 2018-03-15 15:10:18 +08:00
OldHawk
56bc134e98 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
2018-03-15 15:02:07 +08:00
OldHawk
750c9d398d Merge commit '9f4ae036436afd441274093dfce68e4299553397'
* commit '9f4ae036436afd441274093dfce68e4299553397':
  merge from meanTorrent
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global HOST settings
  doc(readme): update readme.md
2018-03-15 14:59:56 +08:00
OldHawk
cb87fe2ec1 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  merge from meanTorrent
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global HOST settings
  doc(readme): update readme.md
2018-03-15 14:11:06 +08:00
OldHawk
25bcfe8998 feat(about): requests rule files 2018-03-15 14:01:54 +08:00
OldHawk
95848ee3bf feat(about): global speech rule files 2018-03-15 14:01:36 +08:00
OldHawk
9558812afe feat(about): add templates of back-end modify online in admin control panel. 2018-03-15 13:21:35 +08:00
OldHawk
522847aa0a feat(about): add many rule files route and menu item 2018-03-15 12:39:26 +08:00
OldHawk
9c999b1b53 feat(about): vip user rule files 2018-03-15 12:38:39 +08:00
OldHawk
e247da1e8e feat(about): user rule files 2018-03-15 12:38:24 +08:00
OldHawk
87e6f25ac1 feat(about): user level rule files 2018-03-15 12:38:10 +08:00
OldHawk
7278813224 feat(about): torrent uploader rule files 2018-03-15 12:37:49 +08:00
OldHawk
2be74a70de feat(about): user score rule files 2018-03-15 12:37:29 +08:00
OldHawk
edeb1da27f feat(about): invitation rule files 2018-03-15 12:37:16 +08:00
OldHawk
5d8096a4f5 feat(about): h&r rule files 2018-03-15 12:37:02 +08:00
OldHawk
8d7bf90327 new(about): h&r rule files 2018-03-15 12:36:35 +08:00
OldHawk
823f58b94d Merge commit '9f4ae036436afd441274093dfce68e4299553397'
* commit '9f4ae036436afd441274093dfce68e4299553397':
  merge from meanTorrent
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global settings for demo
  cfg(core): config global HOST settings
  doc(readme): update readme.md

# Conflicts:
#	README.md
#	config/env/development.js
#	config/env/production.js
#	config/env/torrents.js
2018-03-14 21:18:50 +08:00
OldHawk
521acc547f fix(forums): oper only forums tooltip translate string 2018-03-14 21:00:48 +08:00
OldHawk
9f4ae03643 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  chg(forums): change title and greet message of forum home
  feat(forums): show moderators is none when a forum has no any moderators
  feat(forums): show moderators is none when a forum has no any moderators
2018-03-14 13:24:29 +08:00
OldHawk
3a4ced68e6 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  chg(forums): change title and greet message of forum home
2018-03-14 13:19:16 +08:00
OldHawk
3a77ccb021 chg(forums): change title and greet message of forum home 2018-03-14 13:18:37 +08:00
OldHawk
bb3d4aedd4 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  feat(forums): show moderators is none when a forum has no any moderators
2018-03-14 13:07:26 +08:00
OldHawk
a1a218d6e0 feat(forums): show moderators is none when a forum has no any moderators 2018-03-14 13:06:34 +08:00
OldHawk
3e8f27ac7a Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  feat(forums): show moderators is none when a forum has no any moderators
2018-03-14 12:59:29 +08:00
OldHawk
c9352b15ac feat(forums): show moderators is none when a forum has no any moderators 2018-03-14 12:58:09 +08:00
OldHawk
40c8ec1643 Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  doc(readme): update readme.md

# Conflicts:
#	README.md
2018-03-12 14:47:12 +08:00
OldHawk
18c8994b2f Merge branch 'master' of https://github.com/taobataoma/meanTorrent
* 'master' of https://github.com/taobataoma/meanTorrent:
  doc(readme): update readme.md

# Conflicts:
#	README.md
2018-03-12 14:44:09 +08:00