merge requests for PLi's git

Started by Persian Prince, 16 Apr 2013 12:12

«
Prev

Next
»

Please log in to reply

1748 replies to this topic

Re: merge requests for PLi's git #1581 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 18 February 2023 - 09:28

please apply

[transmission] auto scan/add any-name.torrent if insert USB

and this part

https://github.com/O...99ad968f8d54ee9

https://github.com/O...aafe1cc4f49fc1e

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1582 Huevos

PLi® Contributor
4,621 posts

+161

Excellent

Posted 18 February 2023 - 14:01

When is "transmission" plugin going to be compatible with Py3?

Re: merge requests for PLi's git #1583 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 18 February 2023 - 16:57

When is "transmission" plugin going to be compatible with Py3?

Isn't it already compatible?

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1584 Huevos

PLi® Contributor
4,621 posts

+161

Excellent

Posted 18 February 2023 - 18:32

When is "transmission" plugin going to be compatible with Py3?

Isn't it already compatible?

From the amount of complaints, no. Have you tried it in PLi develop?

Re: merge requests for PLi's git #1585 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 19 February 2023 - 08:41

From the amount of complaints, no. Have you tried it in PLi develop?

yes,it work

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1586 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 19 February 2023 - 08:45

Again!

please apply enigma2 plugin master

[transmission] auto scan/add any-name.torrent if insert USB

enigma2 plugin python3

[transmission] auto scan/add any-name.torrent if insert USB

[epgrefresh] message yes/no(60sec) before power off after refresh

enigma2 develop

[Navigation] save to variable config.misc.prev_wakeup_time.value

[ConfigList] add sanity check in getCurrentValue

[ServiceInfo] add "Codec & lang" in IPTV 4097/5001/5002

[pmt] not select audio track narration by default if auto select off

Edited by Dimitrij, 19 February 2023 - 09:33.

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1587 littlesat

PLi® Core member
57,062 posts

+698

Excellent

Posted 19 February 2023 - 12:38

The first one cannot be merged. I merged some of them or leave some comments.

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W

Re: merge requests for PLi's git #1588 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 19 February 2023 - 12:40

The first one cannot be merged. I merged some of them or leave some comments.

OK.

I closed the PR [pmt] not select audio track narration by default if auto select off .

The other two are required.

Edited by Dimitrij, 19 February 2023 - 12:41.

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1589 littlesat

PLi® Core member
57,062 posts

+698

Excellent

Posted 19 February 2023 - 12:48

Explain…. Because the description does not describe why and what it may solve…

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W

Re: merge requests for PLi's git #1590 Dimitrij

PLi® Core member
10,263 posts

+347

Excellent

Posted 19 February 2023 - 13:21

Explain…. Because the description does not describe why and what it may solve…

https://github.com/O...ssue-1533844327

https://github.com/O...ssue-1588099082

GigaBlue UHD Quad 4K /Lunix3-4K/Duo 4K

Re: merge requests for PLi's git #1591 Abu Baniaz

PLi® Contributor
2,494 posts

+64

Good

Posted 27 February 2023 - 07:58

Some pull request here: https://github.com/O...2-plugins/pulls

Re: merge requests for PLi's git #1592 Taapat

PLi® Core member
2,345 posts

+121

Excellent

Posted 17 March 2023 - 16:27

Maybe someone with admin rights can set in enigma2-plugins python3 as default branch?

Otherwise, when viewing the code in the web or creating a pull request, you must always change master to python3.

P.S.

Why are many pull requests with one commit in enigma2 and enigma2-plugins merged with merge commit instead of, for example, squash and merge?

It seems to me that this merge commit just unnecessarily takes up the commit history.

If there are multiple commits, then I understand that, but if only one?

Re: merge requests for PLi's git #1593 WanWizard

PLi® Core member
70,220 posts

+1,798

Excellent

Posted 17 March 2023 - 16:43

Done.

And because "they" (and that may include me) just click on the merge button, without checking what kind of merge is set as default by github (that sometimes changes for some unknown reason)?

Currently in use: VU+ Duo 4K (2xFBC S2), VU+ Solo 4K (1xFBC S2), uClan Usytm 4K Ultimate (S2+T2), Octagon SF8008 (S2+T2), Zgemma H9.2H (S2+T2)

Due to my bad health, I will not be very active at times and may be slow to respond. I will not read the forum or PM on a regular basis.

Many answers to your question can be found in our new and improved wiki.

Re: merge requests for PLi's git #1594 Taapat

PLi® Core member
2,345 posts

+121

Excellent

Posted 17 March 2023 - 16:51

Thank you!

If we talk about the github web interface, I have observed that it remembered the latter.

If you switch to squash and merge once, then squash and merge is offered until you choose another option.

Edited by Taapat, 17 March 2023 - 16:53.

Re: merge requests for PLi's git #1595 Huevos

PLi® Contributor
4,621 posts

+161

Excellent

Posted 17 March 2023 - 21:29

Should use "rebase and merge". That way the individual commits show but not the merge commit. If you squash you lose all the information from the individual commits. So don't squash.

Edited by Huevos, 17 March 2023 - 21:30.