Commit Graph
89 Commits
Author SHA1 Message Date
AlstruitandGitHub 5f67e915a0 Merge pull request #38448 from ahmadalaa0113-sudo/patch-7
Add LTV1 And LTV7 Now
2026-06-03 22:52:20 -05:00
Alsturit abbd08e3ff Split into seperate issues #8941 and #8921
# Conflicts:
#	streams/ar.m3u
#	streams/us.m3u
2022-09-22 02:36:29 -05:00
Alsturit 15f8c22d98 Fix npx 2022-09-21 17:27:19 -05:00
Alsturit 0c3a94fc21 Re-Apply suggestions by UltraHDR:
Change dailymotion links in fr.m3u and ve.m3u

Co-authored by: UltraHDR <108294295+UltraHDR@users.noreply.github.com>
2022-09-21 17:15:18 -05:00
Alsturit e5a436a835 Merge Duplicate Entry
Reference:
https://github.com/iptv-org/iptv/blob/23e6dfc3b82bd08c3955f538080f469022c734cc/channels/us.m3u~master#L1382-L1383
2022-09-21 17:14:35 -05:00
Alsturit b08236f696 Add adaptive streams 2022-09-21 17:14:35 -05:00
Alsturit e349979af2 Redo (Rebase manually) and squash commits.
Commit messages squashed:
Add streams.
Change status 24/7
Add streams
Remove incorrect stream

Merge, rebase, and force push (even with lease) combined do not go well together.
2022-09-21 17:14:29 -05:00
Alsturit 3b0f954b09 Fix streams 2022-09-20 20:34:31 -05:00
Alsturit 2608f488ff Add and update channels 2022-09-15 06:28:46 -05:00
Alsturit 88cffe0163 Merge branch 'master' into alstruit-9_w3
# Conflicts:
#	streams/us.m3u
2022-09-14 08:38:52 -05:00
Alsturit e7d2680670 Change duplicate ID for alstruit/iptv-database@86b2f13 2022-09-14 08:35:53 -05:00
Alsturit bb1b7e1961 Remove duplicate entries 2022-09-14 08:30:05 -05:00
Alsturit c7bd09b4cc Merge branch 'master' into alstruit-9_w3 2022-09-13 18:04:00 -05:00
Alsturit 755dc550d6 Add channels 2022-09-13 17:58:47 -05:00
Alsturit 53c5ef0671 Add channels 2022-09-13 00:28:51 -05:00
Alsturit 490da944b9 Add channels and cleanup 2022-09-12 23:55:59 -05:00
Alsturit 30ed53f3cc Change name of previous known commit 2022-09-12 22:38:59 -05:00
Alsturit e93a9b1238 Add channels 2022-09-12 22:36:25 -05:00
Alsturit fbf3122a15 Update channels 2022-09-11 10:47:51 -05:00
Alsturit 8a33d85b5a Add channels 2022-09-11 10:13:24 -05:00
Alsturit d2c4d714c1 Merge branch 'master' into update-vn.m3u 2022-09-10 06:09:15 -05:00
Alsturit 7689dedb96 Merge branch 'master' into update-do.m3u 2022-09-10 05:58:03 -05:00
Alsturit c9218eb3c5 Merge branch 'master' into update-us_localbtv.m3u 2022-09-10 05:50:15 -05:00
Alsturit dbec0f1791 Merge branch 'master' into update-us_tubi.m3u 2022-09-10 05:34:26 -05:00
Alsturit bb2665b687 Fix missing Carriage Return 2022-09-10 04:58:58 -05:00
Alsturit 8ed77954b3 Hotfix missing tvg-id 2022-09-09 23:25:45 -05:00
Alsturit d0added251 Hotfix missing tvg-id 2022-09-09 22:46:28 -05:00
Alsturit 2fc5e48683 Merge branch 'master' into alstruit-9_w2
# Conflicts:
#	streams/cn.m3u
#	streams/es.m3u
#	streams/nl.m3u
#	streams/us.m3u
2022-09-08 23:11:07 -05:00
Alsturit 3767123fff Add channels 2022-09-08 22:48:45 -05:00
Alsturit e5ece38a4f Withhold ID #8384 2022-09-08 22:20:18 -05:00
Alsturit 2d3ab194da Add channels 2022-09-08 22:17:44 -05:00
Alsturit 2e52e4e8c8 Add channels 2022-09-08 20:44:05 -05:00
Alsturit 55a5a0b639 Change Tvg-id #8489 2022-09-08 19:59:57 -05:00
Alsturit 837adf9e94 Add channels 2022-09-08 19:58:06 -05:00
Alsturit 522666ba99 Remove dups and add channels 2022-09-08 11:54:46 -05:00
Alsturit 9fda66cea7 Remove dups by merge and add channels 2022-09-08 11:35:33 -05:00
Alsturit 2108899bfc Hotfix #8423 2022-09-08 10:54:41 -05:00
Alsturit ec5b036ab3 Merge branch 'master' into alstruit-9_w2
# Conflicts:
#	streams/ca.m3u
#	streams/us.m3u
2022-09-08 10:27:39 -05:00
Alsturit a1ef7e3e74 Add channels 2022-09-08 09:50:37 -05:00
Alsturit cbc24f0415 Remove dupes 2022-09-08 03:34:40 -05:00
Alsturit ac7a963c2e Remove dupes 2022-09-08 03:34:40 -05:00
Alsturit 189bcf0a90 Add channels 2022-09-08 03:34:40 -05:00
Alsturit bf1458b15c Add channels 2022-09-08 03:34:40 -05:00
Alsturit 5fac70efd8 Fix stream 2022-09-08 03:34:25 -05:00
Alsturit b6268ec082 Merge conflict 2022-09-06 09:42:11 -05:00
Alsturit c723e888ed Fix Broken link 2022-09-06 08:07:02 -05:00
Alsturit 7bb5822042 Fix npx 2022-09-06 05:45:16 -05:00
Alsturit 1b0a697f6b Add channels 2022-09-06 05:41:39 -05:00
Alsturit e3f3725c37 Add channels 2022-09-06 04:31:51 -05:00
Alsturit 091b6cab16 Resolve conflict 2022-09-06 03:39:44 -05:00
Alsturit 5a398a38f1 Fix naming 2022-09-05 17:38:01 -05:00
Alsturit 6c9b0c4819 Add channels 2022-09-05 17:16:44 -05:00
Alsturit a5eb533e54 Add channels 2022-08-31 04:47:30 -05:00
Alsturit e209e187a7 Cleanup 2022-08-30 16:54:38 -05:00
Alsturit 54748ca12a Reorder to fix merge conflict 2022-08-30 16:53:14 -05:00
Alsturit bc35b1ef49 Fix merge conflict 2022-08-29 02:21:05 -05:00
Alsturit ad6391d42b Fix merge conflict 2022-08-28 09:50:42 -05:00
Alsturit d4b3ef76bb Resolve merge conflict 2022-08-28 09:36:53 -05:00
Alsturit 4d03a93070 Resolve merge conflict 2022-08-28 09:30:07 -05:00
Alsturit 46a0f3b0d9 Fix stream name 2022-08-28 04:18:54 -05:00
Alsturit a780127d8c Resolve merge conflict 2022-08-28 03:19:57 -05:00
Alsturit 58a703612a Merge branch 'master' into alstruit-8.27 2022-08-27 12:57:05 -05:00
Alsturit abb7697ea7 Resolve identical names 2022-08-27 09:41:01 -05:00
Alsturit 3d644df292 Group regional streams 2022-08-27 09:40:14 -05:00
Alsturit f831fab5b8 Add streams 2022-08-27 09:39:11 -05:00
Alsturit 2ca3106ce4 Fix merge conflict 2022-08-18 03:11:42 -05:00
Alsturit 6882c3d0b2 Resolve conflict 2022-08-18 03:08:11 -05:00
Alsturit 330dc1267b Add/Update kr.m3u 2022-08-17 19:45:18 -05:00
Alsturit a3f5229048 Resolve conflict 2022-08-17 04:45:11 -05:00
Alsturit 01673caca8 Merge conflict 2022-08-16 11:23:58 -05:00
Alsturit 777d4f0739 Add/Update channels 2022-08-16 11:13:46 -05:00
Alsturit 7167e304a6 Update Kr.m3u 2022-07-22 22:40:16 -05:00
Alsturit 0932e876ad Update Kr.m3u 2022-07-22 22:15:05 -05:00
Alsturit 746677b6f0 Update and fix kr.m3u 2022-07-20 07:08:36 -05:00
Alsturit acd6815ddc Update us.m3u 2022-07-20 05:10:07 -05:00
Alsturit c2f0e4e9e4 Revert "Tvg-id fix"
This reverts commit b5c4716ca7.
2022-07-19 03:45:22 -05:00
Alsturit 4768c1f9f9 Revert to b5c4716 2022-07-19 03:44:49 -05:00
Alsturit 1de4d94ee0 Merge remote-tracking branch 'origin/master' into Kr_7.17.22 2022-07-19 03:09:13 -05:00
Alsturit b5c4716ca7 Tvg-id fix 2022-07-18 18:26:17 -05:00
Alsturit 4f86f8332c Update 2022-07-18 18:11:05 -05:00
Alsturit 9959a98f03 Update and fix tvg-id 2022-07-18 09:21:40 -05:00
Alsturit 7a33060e40 Resolve conflict 2022-07-17 21:56:40 -05:00
Alsturit 326bef81fa Add tvg-id and reorder 2022-07-17 21:50:00 -05:00
Alsturit 5b1bab16c8 Add tvg-id and reorder 2022-07-17 21:42:32 -05:00
Alsturit 358e8432ff Resolve conflict 2022-07-17 03:39:54 -05:00
Alsturit 5e3b0117ff Resolve conflict 2022-07-17 03:33:17 -05:00
Alsturit a18d33b9aa Add MBC to kr.m3u 2022-07-16 23:03:52 -05:00
Alsturit 34bebbccf8 Update to latest change to kr.m3u 2022-07-16 21:02:29 -05:00
Alsturit fc3064f36b Fix: SBS Links and push error 2022-07-16 13:27:20 -05:00