Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-Registration-Core
Commits
3fa2b8ce
Commit
3fa2b8ce
authored
3 years ago
by
Dileep Bapat
Browse files
Options
Download
Plain Diff
Merge branch 'main' of github.com:Sunbird-RC/sunbird-rc-core into main
# Conflicts: # java/plugins/pom.xml
parents
46cb1375
dcfc47c4
main
create_attach_entity_role_to_user
json-template-type-conv
pr-external-context
pr-template-url
sunbirdrc.dev
test-fix
uat-deploy
upsmfac-main
v0.0.12
v0.0.13
v0.0.12
v0.0.11
v0.0.10
v0.0.9
v0.0.8
v0.0.7
v0.0.6
v0.0.5
v0.0.4
v0.0.3
v0.0.2
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
deps/keycloak/themes/ndear/login/resources/css/login.css
+3
-0
deps/keycloak/themes/ndear/login/resources/css/login.css
deps/keycloak/themes/ndear/login/resources/css/main.css
+0
-1
deps/keycloak/themes/ndear/login/resources/css/main.css
java/plugins/divoc-external-plugin/src/main/java/dev/sunbirdrc/plugin/DivocActor.java
+4
-4
...plugin/src/main/java/dev/sunbirdrc/plugin/DivocActor.java
java/registry/pom.xml
+5
-0
java/registry/pom.xml
java/registry/src/main/java/dev/sunbirdrc/registry/config/GenericConfiguration.java
+0
-3
...a/dev/sunbirdrc/registry/config/GenericConfiguration.java
java/registry/src/main/java/dev/sunbirdrc/registry/helper/RegistryHelper.java
+13
-6
...in/java/dev/sunbirdrc/registry/helper/RegistryHelper.java
with
25 additions
and
14 deletions
+25
-14
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
