Migration #4
Merged
Migration #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: app/models/ChatRoom.scala app/views/chatRoom.scala.html public/stylesheets/niptechlive-main.css
|
J'ai aussi rendu générique l'url websocket qui était en dure dans controllers.js ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Voila la c'est la bonne version.
Juste une remarque je ne sais pas si c'est volontaire mais :
Si tu mets un numéro d'épisode et un id youtube, tu valide ensuite tu reviens encore sur l'admin : le numéro d'épisode saute et on retrouve a sa place le id youtube.
En gros les 2 utilisent getEpisodeNb (admin.scala.html) . C'est volontaire?