Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DONE] Fanfounet/v4 additional document fix #1267

Closed
wants to merge 21 commits into from
Closed

[DONE] Fanfounet/v4 additional document fix #1267

wants to merge 21 commits into from

Conversation

fanfounet
Copy link
Collaborator

@fanfounet fanfounet commented Feb 13, 2025 •
edited by Badatos
Loading

Charneau Franck and others added 21 commits February 13, 2025 10:22
bug fix first part
0c37d6d
@LoicBonavent
[DONE] Manage playlists for v4 (EsupPortail#1265)
030b077 
Manage playlists module for v4.

* Fixed a bug in list editing by a superuser
* Manage ALLOWED_HOSTS for url_has_allowed_host_and_scheme function (if not, a redirect is made to / and not to the referer, after adding a video to a playlist)

No changes in the behaviour for protected videos.
Fixup. Format code with Prettier
2f006cd
Fixup. Format code with Black
a32aab9
@LoicBonavent
[DONE] Manage playlists for v4 (EsupPortail#1265)
54dab08 
Manage playlists module for v4.

* Fixed a bug in list editing by a superuser
* Manage ALLOWED_HOSTS for url_has_allowed_host_and_scheme function (if not, a redirect is made to / and not to the referer, after adding a video to a playlist)

No changes in the behaviour for protected videos.
Fixup. Format code with Prettier
34d6847
Fixup. Format code with Black
7f25809
@Badatos
Replace deprecated Thread.setDaemon (EsupPortail#1256)
cd3bbd0 
Replace deprecated `Thread.setDaemon()` by Thread.daemon property
+ remove useless DEBUG declarations
@fanfounet
[DONE] Fanfounet / fix dressing when not audiotrack (EsupPortail#1263)
f7a37c3 
* fix dressing when not audiotrack
* fix unit test models dressing
* fix test remote encode
* update configuration file
Fixup. Format code with Black
c49a513
Auto-update configuration files
1c95def
fix part 2
61a6ff3
@LoicBonavent
[DONE] Manage playlists for v4 (EsupPortail#1265)
9e35a4b 
Manage playlists module for v4.

* Fixed a bug in list editing by a superuser
* Manage ALLOWED_HOSTS for url_has_allowed_host_and_scheme function (if not, a redirect is made to / and not to the referer, after adding a video to a playlist)

No changes in the behaviour for protected videos.
Fixup. Format code with Prettier
ecd0e4f
Fixup. Format code with Black
1cc0da6
@fanfounet
[DONE] Fanfounet / fix dressing when not audiotrack (EsupPortail#1263)
a197fdb 
* fix dressing when not audiotrack
* fix unit test models dressing
* fix test remote encode
* update configuration file
Fixup. Format code with Black
99e3097
Auto-update configuration files
8e7633f
@Badatos
Increase Flake8 Max Complexity to 9 (EsupPortail#1266)
258be96 
* * Increase Flake8 Max Complexity to 9
* Remove now unnecessary `# noqa: C901` comments
* Try to Reduce complexity of functions remaining > 9
* Increase SQLite timeout to 40.0 seconds
* add missing pydoc
* add missing return types
Fixup. Format code with Black
80343ed
update lang
092add5
@fanfounet fanfounet linked an issue Feb 13, 2025 that may be closed by this pull request
3.8.2 et 3.8.3 : suppression d'un document complémentaire #1240
Open
@Badatos
Copy link
Collaborator

Badatos commented Feb 14, 2025

Des conflits à gérer ;)

@fanfounet
Copy link
Collaborator Author

ah merdasse, je n'ai jamais eu de conflit à ce niveau. La marche à suivre pour ne pas faire de grosses bêtises ?

@LoicBonavent
Copy link
Collaborator

Je ne suis pas un expert, mais cela m'arrive régulièrement :(.
Pour résoudre les conflits :

  • pour les petits fichiers, tu peux directement utiliser l'outil dans Github "Resolve conflicts". Il va afficher le fichier avec les conflits.
    Il rajoute du texte pour préciser les endroits et le code de ta PR et l'autre code. Il faut supprimer ce texte rajouté et choisir les lignes que tu veux garder. A la fin, il ne reste plus qu'à cliquer "Mark as resolved".
  • pour les plus gros fichiers, il faut passer par ton éditeur de code (typiquement VSCode), faire les modifications adéquates (même principe que pour l'autre méthode) et refaire un git push des fichiers impactés.

J'espère que cela pourra t'aider.

@Badatos Badatos self-requested a review February 17, 2025 08:38
@Badatos Badatos closed this Feb 18, 2025
@Badatos Badatos removed their request for review February 18, 2025 13:18
@Badatos
Copy link
Collaborator

Badatos commented Feb 18, 2025

PR reprise en #1272

@Badatos Badatos removed a link to an issue Feb 18, 2025
3.8.2 et 3.8.3 : suppression d'un document complémentaire #1240
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fanfounet fanfounet

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fanfounet @Badatos @LoicBonavent