Open
Conversation
Bumps [form-data](https://github.com/form-data/form-data) from 3.0.2 to 3.0.4. - [Release notes](https://github.com/form-data/form-data/releases) - [Changelog](https://github.com/form-data/form-data/blob/v3.0.4/CHANGELOG.md) - [Commits](form-data/form-data@v3.0.2...v3.0.4) --- updated-dependencies: - dependency-name: form-data dependency-version: 3.0.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
feat: For demo, use only one agent, the unime agent
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.1 to 3.14.2. - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.14.1...3.14.2) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 3.14.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
See U0r7AbSE/1121-broken-access-control-super-user-paginas
When switching to awarding only on email, there is a invalid email message which must be supressed for initial rendering
Feature/Add directaward audittrail component to fetch and view direct award audit trail
…orge-1.3.2 build(deps): bump node-forge from 1.3.1 to 1.3.2
…l-3.14.2 build(deps): bump js-yaml from 3.14.1 to 3.14.2
…ata-3.0.4 build(deps): bump form-data from 3.0.2 to 3.0.4
Bumps [sha.js](https://github.com/crypto-browserify/sha.js) from 2.4.11 to 2.4.12. - [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md) - [Commits](browserify/sha.js@v2.4.11...v2.4.12) --- updated-dependencies: - dependency-name: sha.js dependency-version: 2.4.12 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…-2.4.12 build(deps): bump sha.js from 2.4.11 to 2.4.12
…tion Link in public collections is to badgeclass
When there is no validated name in the account, there will still be the message that the name was not validated by an institution.
…e-field-to-award-on-private-email Feature/add first and last name field to award on private email
…ctionality-for-email-only Feature/update bulk upload functionality for email only
…-public-badge-page Feature/show recipient name on public badge page
…validation-spinners Add recipient name to validation spinner
…tion Feature/update names in validation
…ce-validated-name Feature/remove modals to enforce validated name
…-4.17.23 build(deps): bump lodash from 4.17.21 to 4.17.23
…-es-4.17.23 build(deps): bump lodash-es from 4.17.21 to 4.17.23
….2.2 build(deps): bump diff from 5.2.0 to 5.2.2
* develop: (44 commits) Remove modal during direct award that enforce validated name Remove modals in backpack that enforce linking to institution Show correct names for claimedby and issuedto Rename display name user util Adding CHANGELOG.md for release 8.4.1 Add recipient name to validation spinner Update public page page to show recipient name when it's filled in Rename function to getRecipientName Update bulk upload functionality for email only Add error code localisation Add first name and surname to api call Add first name and surname fields to direct award on private email Added path to be used by Apple Add extra route for catalog badgeclass page Added app-requirements Added changelog for release 8.4 Update CHANGELOG for release 8.3.3 Small changes related to Microcredentials Formatter build(deps): bump lodash from 4.17.21 to 4.17.23 ...
Contributor
ThomasKalverda
left a comment
ThomasKalverda
left a comment
There was a problem hiding this comment.
That's indeed a big diff. I recognise my work, but I also see a lot of work that is not mine. I find it hard to judge if everything still works. But I also don't know if it should work on the ewi branch..
What is the plan exactly with the feature/ewi branch? Will it be merged into develop at some point?
Contributor
Author
No. It contains mostly adjustments that are only for EWI. Some may be cherry-picked into development/main at some point, but only if there is a need. In high level view, feature/ewi has made these changes:
|
ThomasKalverda
approved these changes
Mar 12, 2026
Contributor
ThomasKalverda
left a comment
ThomasKalverda
left a comment
There was a problem hiding this comment.
Alright, as far as I can tell, my changes are in there. I'll approve it so you can move on, but I can't guarantee that all the other changes are correct.
Contributor
Author
|
I have opened edubadges/edubadges-server#312. While I generally attempt to avoid lockstep-merge-and-release dependencies, doing so here, would require a lot of extra work to develop fallbacks for the short period in which the new frontend was released but the backend not yet or vice-versa. So in this case I opted for the dependency. |
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
5 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.
This merges all changes from development into feature/ewi since the last "sync" (which was a rebase, not a merge). Github is a bit stubborn and turns the single merge-commit into a full blown history, hence the 64 commits; I should have --squashed, sorry 😭
I chose to merge and not rebase, so that you, @ThomasKalverda especially, can review the changes easier. Also, rebasing was a lot of work due to a large amount of conflicts, merging a bit less manual work.
@ThomasKalverda , please check that what you see in this diff, is recognisable as your work on development.
Because in the end, what we will merge into feature/ewi, is the work you did on development, recently. Guess quite some changes may be from @oharsta, but maybe you recognise some of those too?
(Ignore any whitespace or other linting fixes - I've tried to get as many out during the conflict resolution, but thats a ton of manual work. )
@Iso5786 if you have some time, please give it a glance as well, to see if you can spot any obvious mistakes?