Conflict resolution #393
Merged
Conflict resolution #393
Conversation
This file contains 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
needed for pagination etc.
sleidig
force-pushed
the
conflict-resolution
branch
from
2f39ce8 to
5f1669d
Compare
sleidig
force-pushed
the
conflict-resolution
branch
3 times, most recently
from
03f951b to
27c7b27
Compare
sleidig
force-pushed
the
conflict-resolution
branch
from
27c7b27 to
92ce2f6
Compare
# Conflicts: # package-lock.json # package.json # src/app/app.module.ts # src/app/app.routing.ts # src/app/core/database/pouch-database.ts
sleidig
force-pushed
the
conflict-resolution
branch
from
e360b1f to
8bc5ba7
Compare
sleidig
force-pushed
the
conflict-resolution
branch
from
8bc5ba7 to
3ad6870
Compare
# Conflicts: # package-lock.json # package.json
vlle1
approved these changes
Jun 23, 2020
src/app/conflict-resolution/compare-rev/compare-rev.component.ts
Outdated
Show resolved
Hide resolved
src/app/conflict-resolution/compare-rev/compare-rev.component.ts
Outdated
Show resolved
Hide resolved
src/app/child-dev-project/attendance/attendance-month-conflict-resolution-strategy.ts
Outdated
Show resolved
Hide resolved
src/app/conflict-resolution/conflict-resolution/conflict-resolution.component.html
Outdated
Show resolved
Hide resolved
src/app/conflict-resolution/conflict-resolution/conflict-resolution.component.spec.ts
Outdated
Show resolved
Hide resolved
src/app/conflict-resolution/conflict-resolution/conflict-resolution.component.ts
Outdated
Show resolved
Hide resolved
src/app/conflict-resolution/conflict-resolution/conflict-resolution.component.ts
Outdated
Show resolved
Hide resolved
Co-authored-by: vlle1 <36682087+vlle1@users.noreply.github.com>
# Conflicts: # package-lock.json # package.json # src/app/app.module.ts # src/app/child-dev-project/children/children.module.ts # src/app/core/database/pouch-database.ts
sleidig
force-pushed
the
conflict-resolution
branch
from
e244aac to
5712e97
Compare
sleidig
pushed a commit
that referenced
this pull request
Jun 27, 2020
# [2.14.0](2.13.2...2.14.0) (2020-06-27) ### Bug Fixes * prevent error log message about serviceworker not available ([a2eebf9](a2eebf9)) * **dashboard:** improve styling of recent-notes dashboard widgets ([4355ea4](4355ea4)) * **note:** prevent disappearing of children linked in notes ([4aba52b](4aba52b)) * **notes:** add full width to notes table ([7eef007](7eef007)), closes [#457](#457) [#458](#458) * **search:** improve search: loading indication and other hints ([6995476](6995476)), closes [#366](#366) [#456](#456) ### Features * add pagination to tables ([87cddde](87cddde)), closes [#381](#381) [#445](#445) * **conflict-resolution:** view and resolve pouchdb document conflicts ([2a84025](2a84025)), closes [#79](#79) [#393](#393) * **latest-changes:** display changelog based on GitHub Release information ([7226f08](7226f08)), closes [#238](#238)
|
🎉 This PR is included in version 2.14.0 🎉 The release is available on:
Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
also see issue: #79
Visible/Frontend Changes