forked from ocaml-sf/learn-ocaml
-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
WIP PR to help reviewing oauth-moodle-dev #2
Open
erikmd
wants to merge
296
commits into
oauth-moodle
Choose a base branch
from
oauth-moodle-dev
base: oauth-moodle
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
This reverts commit d338fcd.
This fix the first point of the issue ocaml-sf#405.
…ion-errmsg fix: better error msg for X-token registration
Co-authored-by: Erik Martin-Dorel <[email protected]>
* For each OS, run "file", "ldd" or so and "_ --version" * No need for "actions/download-artifact@v2"
Add github action rules for static binaries generation (Linux, Macos)
To fix later: problème avec la synchronisation du nickname affiché
* origin/master: (31 commits) ...
* Rely on `make detect-libs`
Related: PR ocaml-sf#551ocaml-sf#551 Follows-up: ce8c006
& docs: Update docker-compose.yml header and bitnami URL
Various improvements to the teacher page, incl. some inline documentation
* master: (146 commits) chore(docker): Fix org.opencontainers.image.source label ci(docker): Replace `LABEL` Dockerfile commands with `labels:` (GHA) (ocaml-sf#551) fix(i18n): fix escaping issue in i18n fix(ui): update fr translation feat(ui): add some inline documentation to the teacher tab feat(ui): teacher tab: highlight the "apply" button on unsaved changes fix(ui): show different status for open and closed assigned exercises feat(ui): allow partial CSV export feat(ui): allow name input on teacher token creation feat(ui): better string input dialog chore: Add 2 checkboxes in PULL_REQUEST_TEMPLATE.md fix(web-app): Fix `process_html_file` w.r.t. `base_url` refactor(partition-view): Move adhoc CSS code to learnocaml_partition_view.css ci(docker): Fix build-args syntax (docker/build-push-action@v4) ci(docker): Fix GHA input name: s/build_args/build-args/ ci(docker): Use docker/build-push-action@v4 (ocaml-sf#544) ci(macos): Run the `macOS` workflow as well in the weekly CI build feat(partition-view): Add a selector to show (tokens, nicks, or anon IDs) (ocaml-sf#540) feat(web-app): Add feedback button with internationalized tooltip feat(js_utils): Add HTMLElement.title support ... Conflicts: .ci-macosx.sh .github/workflows/static-builds.yml ci/docker-emacs-learn-ocaml-client/.emacs dune-project learn-ocaml-client.opam learn-ocaml.opam learn-ocaml.opam.locked scripts/static-build.sh src/app/learnocaml_common.ml src/app/learnocaml_common.mli src/app/learnocaml_description_main.ml src/app/learnocaml_index_main.ml src/app/learnocaml_teacher_tab.ml src/app/server_caller.ml src/main/dune src/main/learnocaml_client.ml src/main/learnocaml_server_main.ml src/main/linking_flags.sh src/server/learnocaml_server.ml src/state/learnocaml_api.ml src/state/learnocaml_api.mli src/utils/dune static/css/learnocaml_main.css static/index.html translations/fr.po
* Merge duplicate accounts for: git log --pretty='tformat:%an <%ae>' 2847c36^..oauth-moodle-dev | sort -u * To Do later: git log --pretty='tformat:%an <%ae>' | sort -u chore: Start .mailmap file * Merge duplicate accounts for: git log --pretty='tformat:%an <%ae>' dabe34f^..oauth-moodle-dev | sort -u * To Do later: git log --pretty='tformat:%an <%ae>' | sort -u
Using emacs, you should just need to type: - `M-x load-file RET learn-ocaml/scripts/credit-region.el RET` Then select several lines of code you want to inspect, and type: - `<F9>` - `C-y` (to paste the commit message footer)
``` -w Ignore whitespace when comparing the parent’s version and the child’s to find where the lines came from. ```
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.
No description provided.