Marown/iptv
1
0
Fork 0
mirror of https://github.com/iptv-org/iptv.git synced 2024-07-20 00:01:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,164 Commits 5 Branches 0 Tags 638 MiB
e46b18a25f
Commit Graph

5164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tingjhenjiang
870d2ff988 edit on tw channels to match epg of http://epg.51zmt.top:8000/ 2020-04-15 17:34:57 +08:00
Aleksandr Statciuk
00413de6e8
Merge pull request #1187 from tingjhenjiang/master 
edits on cn channels(chinese names, correction)
 2020-04-15 12:28:25 +03:00
Aleksandr Statciuk
3eecc1960f
Merge pull request #1186 from ksl1989/master 
Added 澳門蓮花衛視 Macau Lotus TV
 2020-04-15 12:25:05 +03:00
tingjhenjiang
d89ecd01f7 Merge branch 'master' of https://github.com/iptv-org/iptv 2020-04-15 17:16:58 +08:00
tingjhenjiang
1ca5d94af4 add chinese names to cn channels 2020-04-15 17:16:51 +08:00
ksl1989
56fbe764ec
Added 澳門蓮花衛視 Macau Lotus TV 
* Added 澳門蓮花衛視 Macau Lotus TV
* Corrected metadata on 澳亞衛視 MASTV and 澳門衛視 MSTV
  * Added correct logo to 澳門衛視 MSTV (current logo is 澳亞衛視 MASTV's)
  * Both channels seems to broadcast mostly in Mandarin.
 2020-04-15 17:09:53 +08:00
Aleksandr Statciuk
1e84bcf091
Merge pull request #1185 from tingjhenjiang/master 
[cn,hk,tw] minor corrections
 2020-04-15 11:55:02 +03:00
Aleksandr Statciuk
da442f3430
Update cn.m3u 2020-04-15 11:54:18 +03:00
tingjhenjiang
4e492b5707 minor edit on cn channel name and tvg-name 2020-04-15 16:44:03 +08:00
tingjhenjiang
ec57e31b7f minor edit on tw channel names to match epg in http://epg.51zmt.top:8000 2020-04-15 16:06:36 +08:00
ksl1989
5f926ba1cc
Merge pull request #2 from iptv-org/master 
Merge upstream
 2020-04-15 15:56:49 +08:00
tingjhenjiang
7f76134cf1 [cn,hk,tw] minor corrections 2020-04-15 14:35:51 +08:00
github-actions[bot]
e7848a0124
Merge pull request #1184 from iptv-org/bot-patch-653aefc 
[Bot] Update README.md
 2020-04-15 01:05:58 +00:00
freearhey
cd066116c8 Update README.md 2020-04-15 01:05:17 +00:00
github-actions[bot]
653aefcdce
Merge pull request #1183 from iptv-org/bot-patch-89f75c4 
[Bot] Format playlists
 2020-04-15 00:04:06 +00:00
freearhey
6335fccc53 Formatted playlists 2020-04-15 00:03:10 +00:00
Aleksandr Statciuk
89f75c44bc
Merge pull request #1182 from tingjhenjiang/master 
mv Macau chs in HK to Macau; repair overly Macau deletion in previous…
 2020-04-14 23:24:04 +03:00
tingjhenjiang
64f57b3b5b mv Macau chs in HK to Macau; repair overly Macau deletion in previous commit 2020-04-15 02:59:02 +08:00
Aleksandr Statciuk
266679e678
Merge pull request #1181 from ksl1989/master 
Corrected Macau list
 2020-04-14 21:25:03 +03:00
Aleksandr Statciuk
e124ac3f2b
Merge pull request #1178 from tingjhenjiang/master 
[cn,hk,tw] modify add more information and channels
 2020-04-14 21:13:10 +03:00
Aleksandr Statciuk
adff474a76
Merge pull request #1180 from SileC/patch-17 
Update us.m3u Add CNN
 2020-04-14 21:11:10 +03:00
Aleksandr Statciuk
1fa102fbc1
Merge pull request #1174 from SileC/patch-13 
Add Fox News new link
 2020-04-14 21:08:40 +03:00
Aleksandr Statciuk
bf5fbed47b
Update us.m3u 2020-04-14 21:02:48 +03:00
Aleksandr Statciuk
51afec387d
Merge pull request #1179 from SileC/patch-16 
Update category
 2020-04-14 20:54:24 +03:00
ksl1989
318ee02b11
Removed empty lines 2020-04-15 01:02:21 +08:00
ksl1989
dd85e5de97
Corrected MASTV 澳亞衛視 
* Removed duplicate link, same URL but with "SD" in caps.
* Corrected name. 澳丫卫视  is a typo.
* Added logo.
 2020-04-15 00:59:49 +08:00
ksl1989
973000e180
Organized TDM channels 
* Changed order of channels to make it easier to understand and correct.
* Corrected language: Canal Macau (TDM channel 2) is a Portuguese-language channel.
* Removed duplicate of Canal Macau, it was repeated with port added.
* Removed duplicate of 澳視澳門 TDM Ou Mun (TDM channel 1), it was repeated with a different name  (澳卫澳门) and the same URL with a double slash.
* Removed duplicate of 澳門-MACAU,  it was repeated with a different name and the same URL with a double slash.
* Changed the names of the channels into the official names, Chinese for the Cantonese channels, Portuguese for the Portuguese one.
* Added "Yue Chinese" (Cantonese) language to the Cantonese channels.
* 澳門-MACAU is a channel intended for international broadcast, it broadcasts programming both from the Portuguese and Cantonese Channels.
* Added categories.
* Removed 澳视澳门, 澳门1 & 澳门2, all duplicates with IP address instead of domain name.
* Changed the logos of the Cantonese channels to the individual channel logos, rather then the general TDM logo.
 2020-04-15 00:23:12 +08:00
tingjhenjiang
cbcc441764 [cn] move a mislocated channel 2020-04-14 23:06:43 +08:00
tingjhenjiang
757e0455f0 [cn] modify a channel 2020-04-14 23:02:45 +08:00
SileC
01197a4d6c
Update us.m3u 2020-04-14 10:49:38 -04:00
tingjhenjiang
af070ae0da move mislocated channels 2020-04-14 22:47:00 +08:00
SileC
2d249fc1de
Update category 2020-04-14 08:44:51 -04:00
tingjhenjiang
28d1a57e1f [cn,hk,tw] modify add more information and channels 2020-04-14 20:31:43 +08:00
freearhey
c83fbd1e3f Update unsorted.m3u 
Move CNN to us.m3u
 2020-04-14 14:28:13 +03:00
freearhey
14ab56edf5 Merge branch 'master' of github.com:iptv-org/iptv 2020-04-14 14:27:42 +03:00
freearhey
a4b9603180 Update us.m3u 
Added CNN channel
 2020-04-14 14:26:49 +03:00
Aleksandr Statciuk
410294dc51
Merge pull request #1175 from SileC/patch-14 
Update ro.m3u add A7TV
 2020-04-14 13:47:46 +03:00
SileC
11cc557a2f
Update ro.m3u 2020-04-13 23:57:40 -04:00
SileC
9d4b296fd8
Add Fox News new link 2020-04-13 23:20:35 -04:00
github-actions[bot]
a81477a201
Merge pull request #1172 from iptv-org/bot-patch-ec8578a 
[Bot] Update README.md
 2020-04-14 01:05:21 +00:00
freearhey
cc1d2d0849 Update README.md 2020-04-14 01:04:42 +00:00
github-actions[bot]
ec8578a8dd
Merge pull request #1171 from iptv-org/bot-patch-d56edcc 
[Bot] Format playlists
 2020-04-14 00:10:24 +00:00
freearhey
9026001ea5 Formatted playlists 2020-04-14 00:06:48 +00:00
Aleksandr Statciuk
d56edccc89
Merge pull request #1168 from tingjhenjiang/master 
add some HK and TW channels
 2020-04-14 02:21:32 +03:00
Aleksandr Statciuk
e3aace6f2a
Merge pull request #1169 from SileC/patch-8 
Add music channel
 2020-04-14 02:18:57 +03:00
Aleksandr Statciuk
f997bd9f1f
Merge pull request #1167 from SileC/patch-9 
Add oplot tv
 2020-04-14 02:14:53 +03:00
Aleksandr Statciuk
78fffe869c
Update ru.m3u 2020-04-14 02:14:14 +03:00
Aleksandr Statciuk
74d105b59a
Merge pull request #1166 from SileC/patch-10 
Add HOBOC channel
 2020-04-14 02:13:08 +03:00
Aleksandr Statciuk
e8e588d2ae
Update ru.m3u 2020-04-14 02:12:55 +03:00
Aleksandr Statciuk
4cbd1d9125
Merge pull request #1164 from SileC/patch-12 
Add Bizarre channel
 2020-04-14 02:09:11 +03:00