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-SunbirdEd-portal-old
Commits
b864a0f5
Commit
b864a0f5
authored
4 years ago
by
ArtiSingh23
Browse files
Options
Download
Plain Diff
Merge branch 'release-3.1.0' of
https://github.com/Sunbird-Ed/SunbirdEd-portal
into SH-545
parents
600bf1a1
ead2ed42
Changes
13
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
src/app/client/angular.json
+1
-1
src/app/client/angular.json
src/app/client/package.json
+1
-1
src/app/client/package.json
src/app/client/src/app/modules/core/components/main-header/main-header.component.html
+2
-2
...es/core/components/main-header/main-header.component.html
src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.html
+1
-1
...nents/activity/activity-list/activity-list.component.html
src/app/client/src/app/modules/groups/components/activity/activity-list/activity-list.component.ts
+0
-1
...ponents/activity/activity-list/activity-list.component.ts
src/app/client/src/app/modules/groups/components/group-members/group-members.component.html
+1
-1
...ups/components/group-members/group-members.component.html
src/app/client/src/app/modules/groups/components/group-members/group-members.component.spec.ts
+3
-3
.../components/group-members/group-members.component.spec.ts
src/app/client/src/app/modules/groups/components/group-members/group-members.component.ts
+5
-4
...roups/components/group-members/group-members.component.ts
src/app/client/src/app/modules/public/module/signup/components/signup/signup.component.html
+1
-1
...lic/module/signup/components/signup/signup.component.html
src/app/package.json
+6
-5
src/app/package.json
src/app/resourcebundles/json/en.json
+1
-1
src/app/resourcebundles/json/en.json
src/app/server.js
+22
-2
src/app/server.js
src/app/yarn.lock
+485
-11
src/app/yarn.lock
with
529 additions
and
34 deletions
+529
-34
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