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
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
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
3a77ccb021
chg(forums): change title and greet message of forum home
2018-03-14 13:18:37 +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
c9352b15ac
feat(forums): show moderators is none when a forum has no any moderators
2018-03-14 12:58:09 +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
OldHawk
ada5c4382e
doc(readme): update readme.md
2018-03-12 14:29:13 +08:00
OldHawk
5db8646992
merge from meanTorrent
2018-03-12 00:32:58 +08:00
OldHawk
35f208d154
Merge commit 'fe7b1b1a3240511e5969a4a581175e531118bd18'
...
* commit 'fe7b1b1a3240511e5969a4a581175e531118bd18':
chg(core): change http:// to https:// of torrent.js and other files
# Conflicts:
# README.md
# config/env/development.js
# config/env/production.js
# config/env/torrents.js
2018-03-12 00:26:49 +08:00
OldHawk
2d0fd22fa3
Merge branch 'master' of https://github.com/taobataoma/meanTorrent
...
* 'master' of https://github.com/taobataoma/meanTorrent :
cfg(torrents): new app configure settings of app.domain
cfg(torrents): new app configure settings of app.domain
cfg(torrents): new app configure settings of app.domain
chg(vip): disable payment event
cfg(core): config global SIGN settings
cfg(core): config global HOST settings
conf(config): config settings for hello.pt
conf(config): config settings for hello.pt
conf(config): config settings for hello.pt
doc(readme): update readme.md
add ignored file
# Conflicts:
# README.md
# config/env/development.js
# config/env/production.js
# config/env/torrents.js
2018-03-12 00:23:10 +08:00
OldHawk
fe7b1b1a32
Merge commit '1700694084d9502ecd34bd880ac1f867e06d3bf7'
...
* commit '1700694084d9502ecd34bd880ac1f867e06d3bf7':
cfg(torrents): new app configure settings of app.domain
cfg(torrents): new app configure settings of app.domain
cfg(torrents): new app configure settings of app.domain
chg(vip): disable payment event
cfg(core): config global SIGN settings
cfg(core): config global HOST settings
conf(config): config settings for hello.pt
conf(config): config settings for hello.pt
conf(config): config settings for hello.pt
doc(readme): update readme.md
add ignored file
2018-03-12 00:09:59 +08:00
OldHawk
2bf31b17fe
chg(core): change http:// to https:// of torrent.js and other files
2018-03-11 23:53:49 +08:00
OldHawk
1700694084
cfg(torrents): new app configure settings of app.domain
2018-03-11 23:34:03 +08:00
OldHawk
4c61dc925c
cfg(torrents): new app configure settings of app.domain
2018-03-11 22:56:56 +08:00
OldHawk
ac1385e015
cfg(torrents): new app configure settings of app.domain
2018-03-11 22:51:06 +08:00
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
