Feature/education#2
Open
GarryBrown wants to merge 105 commits into
Open
Conversation
…t, new in authentificate in principal subject. Jwt check ROLE_B2B.
…ist stores(shops)
…dule. Details in Edit by disabled input. Add disabled property in autocomplite. Starter store-list component.
# Conflicts: # package.json # src/app/components/header/header.component.html # src/app/components/sidebar/sidebar.component.html # src/app/components/sidebar/sidebar.component.ts # src/app/core/auth/auth-jwt.service.ts # src/app/core/core.module.ts # src/app/core/principal/principal.service.ts # src/app/modules/orders/orders.component.ts
navigation style
logo style
…ent. Add new shop in edit user. Replace store-dialog to shared. Add GetHelp component template.
# Conflicts: # package.json # src/app/app.module.ts # src/app/components/header/header.component.html # src/app/components/sidebar/sidebar.component.html # src/app/components/sidebar/sidebar.component.ts # src/app/core/core.module.ts # src/app/core/principal/principal.service.ts # src/app/modules/kpi/dialogs/order-detail.component.scss # src/app/modules/kpi/kpi.module.ts # src/app/modules/landing/landing-page/landing-page.component.html # src/app/modules/orders/orders.component.html # src/app/modules/orders/orders.component.scss # src/app/modules/orders/orders.component.ts # src/app/modules/orders/orders.service.ts # src/app/shared/shared.module.ts # src/manifest.json
…-Manager-Frontend into feature/filterBar # Conflicts: # src/app/modules/kpi/kpi.module.ts # src/app/modules/kpi/plan-detail/plan-detail.component.html # src/app/modules/kpi/plan-detail/plan-detail.component.ts
…-Manager-Frontend into feature/filterBar # Conflicts: # src/app/in-mem-data-service.ts # src/app/modules/kpi/plan-detail/plan-detail.component.html # src/app/modules/kpi/plan-detail/plan-detail.component.scss # src/app/modules/kpi/plan-detail/plan-detail.component.ts
…P to id field for iterate by fields. Begin FilterSideBar bind data for configurate reports.
…ORI/Hermes-Manager-Frontend into feature/education # Conflicts: # src/app/modules/education/steps/step/step.component.scss
…ORI/Hermes-Manager-Frontend into feature/education
…ORI/Hermes-Manager-Frontend into feature/education
…ORI/Hermes-Manager-Frontend into feature/education # Conflicts: # src/app/in-mem-data-service.ts # src/app/modules/education/steps/steps.component.html
…s in finish results step;
…ode of side nav by window resize.
…ORI/Hermes-Manager-Frontend into feature/education # Conflicts: # src/app/modules/education/steps/step/step.component.html # src/app/modules/education/steps/steps.component.html
…ORI/Hermes-Manager-Frontend into feature/education # Conflicts: # src/app/modules/education/steps/result/result.component.html
…ORI/Hermes-Manager-Frontend into feature/education
…ut logic. Created table in eduResult and counted value for all marks.
…tions and answers. Changed mockData in questions.
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
3 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.
No description provided.