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
collection-editor
Commits
c83ec682
Commit
c83ec682
authored
2 years ago
by
Rajnish Dargan
Browse files
Options
Download
Plain Diff
Issue #IQ-320 feat: merge 5.4.0 to main conflict fixes
parents
67fa3a3c
069c9e05
Changes
145
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.circleci/config.yml
+12
-2
.circleci/config.yml
README.md
+144
-21
README.md
angular.json
+16
-8
angular.json
docs/CONFIGURATION.md
+278
-0
docs/CONFIGURATION.md
package-lock.json
+7903
-8624
package-lock.json
package.json
+45
-39
package.json
projects/collection-editor-library/karma.conf.js
+10
-5
projects/collection-editor-library/karma.conf.js
projects/collection-editor-library/package.json
+10
-6
projects/collection-editor-library/package.json
projects/collection-editor-library/src/lib/collection-editor-library.component.spec.ts
+2
-2
...brary/src/lib/collection-editor-library.component.spec.ts
projects/collection-editor-library/src/lib/collection-editor-library.module.ts
+58
-11
...ditor-library/src/lib/collection-editor-library.module.ts
projects/collection-editor-library/src/lib/collection-editor-library.service.spec.ts
+1
-1
...library/src/lib/collection-editor-library.service.spec.ts
projects/collection-editor-library/src/lib/components/answer/answer.component.spec.ts
+2
-2
...ibrary/src/lib/components/answer/answer.component.spec.ts
projects/collection-editor-library/src/lib/components/app-loader/app-loader.component.spec.ts
+30
-0
...rc/lib/components/app-loader/app-loader.component.spec.ts
projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.data.ts
+17
-1
...onents/asset-browser/asset-browser.component.spec.data.ts
projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.spec.ts
+86
-37
.../components/asset-browser/asset-browser.component.spec.ts
projects/collection-editor-library/src/lib/components/asset-browser/asset-browser.component.ts
+34
-3
...c/lib/components/asset-browser/asset-browser.component.ts
projects/collection-editor-library/src/lib/components/assign-page-number/assign-page-number.component.html
+35
-0
...ents/assign-page-number/assign-page-number.component.html
projects/collection-editor-library/src/lib/components/assign-page-number/assign-page-number.component.scss
+68
-0
...ents/assign-page-number/assign-page-number.component.scss
projects/collection-editor-library/src/lib/components/assign-page-number/assign-page-number.component.spec.data.ts
+1572
-0
...ign-page-number/assign-page-number.component.spec.data.ts
projects/collection-editor-library/src/lib/components/assign-page-number/assign-page-number.component.spec.ts
+158
-0
...s/assign-page-number/assign-page-number.component.spec.ts
with
10481 additions
and
8762 deletions
+10481
-8762
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