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
bd327567
Unverified
Commit
bd327567
authored
4 years ago
by
Vinu Kumar
Committed by
GitHub
4 years ago
Browse files
Options
Download
Plain Diff
Merge branch 'release-3.1.0' into release-3.0.3
parents
2738a248
ead2ed42
Changes
411
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.circleci/config.yml
+5
-5
.circleci/config.yml
.gitignore
+1
-0
.gitignore
src/app/client/angular.json
+9
-2
src/app/client/angular.json
src/app/client/package.json
+7
-9
src/app/client/package.json
src/app/client/src/app/app.component.ts
+11
-6
src/app/client/src/app/app.component.ts
src/app/client/src/app/app.routing.ts
+4
-0
src/app/client/src/app/app.routing.ts
src/app/client/src/app/modules/cbse-program/components/chapter-list/chapter-list.component.scss
+28
-33
...ogram/components/chapter-list/chapter-list.component.scss
src/app/client/src/app/modules/cbse-program/components/ckeditor-tool/ckeditor-tool.component.scss
+12
-24
...ram/components/ckeditor-tool/ckeditor-tool.component.scss
src/app/client/src/app/modules/cbse-program/components/collection/collection.component.scss
+26
-26
...e-program/components/collection/collection.component.scss
src/app/client/src/app/modules/cbse-program/components/content-uploader/content-uploader.component.scss
+157
-220
...mponents/content-uploader/content-uploader.component.scss
src/app/client/src/app/modules/cbse-program/components/dashboard/dashboard.component.html
+3
-3
...bse-program/components/dashboard/dashboard.component.html
src/app/client/src/app/modules/cbse-program/components/dashboard/dashboard.component.scss
+3
-13
...bse-program/components/dashboard/dashboard.component.scss
src/app/client/src/app/modules/cbse-program/components/mcq-creation/mcq-creation.component.scss
+10
-117
...ogram/components/mcq-creation/mcq-creation.component.scss
src/app/client/src/app/modules/cbse-program/components/mcq-template-selection/mcq-template-selection.component.scss
+2
-2
...-template-selection/mcq-template-selection.component.scss
src/app/client/src/app/modules/cbse-program/components/question-creation-header/question-creation-header.component.scss
+1
-1
...n-creation-header/question-creation-header.component.scss
src/app/client/src/app/modules/cbse-program/components/question-creation/question-creation.component.scss
+9
-110
...onents/question-creation/question-creation.component.scss
src/app/client/src/app/modules/cbse-program/components/question-list/question-list.component.scss
+35
-17
...ram/components/question-list/question-list.component.scss
src/app/client/src/app/modules/cbse-program/components/question-preview/question-preview.component.scss
+25
-5
...mponents/question-preview/question-preview.component.scss
src/app/client/src/app/modules/cbse-program/components/recursive-tree/recursive-tree.component.scss
+40
-106
...m/components/recursive-tree/recursive-tree.component.scss
src/app/client/src/app/modules/cbse-program/components/resource-template/resource-template.component.scss
+45
-41
...onents/resource-template/resource-template.component.scss
with
433 additions
and
740 deletions
+433
-740
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
