Merged
Conversation
docs: fix links in QL topics
Approved by jf205, xiemaisi
(cherry picked from commit c47a4e0)
(cherry picked from commit c6c565b)
Learn QL: QL for Python doc fixes for 1.22
docs: fix some formatting issues
QL training slides: increase release number and small css tweaks
Approved by jf205
QL training: add semmle logo image to title slide
1.22: Update for support info for CodeQL term change
Conflicts resolved in favour of master: docs/language/learn-ql/cpp/conversions-classes.rst docs/language/learn-ql/cpp/function-classes.rst docs/language/learn-ql/cpp/introduce-libraries-cpp.rst docs/language/learn-ql/csharp/ql-for-csharp.rst docs/language/learn-ql/javascript/introduce-libraries-ts.rst docs/language/learn-ql/python/introduce-libraries-python.rst docs/language/ql-training/cpp/bad-overflow-guard.rst docs/language/ql-training/cpp/control-flow-cpp.rst docs/language/ql-training/cpp/global-data-flow-cpp.rst docs/language/ql-training/cpp/intro-ql-cpp.rst docs/language/ql-training/cpp/program-representation-cpp.rst docs/language/ql-training/cpp/snprintf.rst docs/language/ql-training/index.rst docs/language/ql-training/java/global-data-flow-java.rst docs/language/ql-training/java/intro-ql-java.rst docs/language/ql-training/java/program-representation-java.rst docs/language/ql-training/java/query-injection-java.rst
Contributor
Author
|
@jf205 - I think that I've fixed the poor conflict resolution. Will build the training slides locally so that you can see the results. |
Contributor
|
I've built the training material locally and it LGTM. |
jf205
approved these changes
Nov 11, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
@jf205 - as discussed, I resolved all the conflicts in favour of master. They were in these files:
Hopefully this is correct, but please let me know if any of the changes are wrong and I'll revert.