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.

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
wants to merge 296 commits into
base: oauth-moodle
Choose a base branch
from

Conversation

erikmd
Copy link
Member

@erikmd erikmd commented Jun 30, 2021

No description provided.

Fixiss and others added 29 commits July 19, 2021 09:57
    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é
erikmd and others added 30 commits May 16, 2023 19:01
&

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.