Commit 2fbb595c authored by anton's avatar anton
Browse files

Update from release_2_1

parents f78e791a 44488585
Pipeline #61149 passed with stage
in 4 minutes and 45 seconds
......@@ -13,6 +13,21 @@ and this project adheres to
No changes.
## [2.1.2] - 2020-05-29
### Added
- Showing author information in CellAnnotationList is configurable, defaults to false
### Fixed
- Wrong cell content in GridDisplay due to reuse of rendered components
### Changed
- Add media screen redirects to media list after submit
## [2.1.1] - 2020-05-25
### Added
......@@ -457,7 +472,8 @@ of a video cannot be retrieved
- Start proper versioning at 1.0.0
[Unreleased]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v2.1.1...release_2_1
[Unreleased]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v2.1.2...release_2_1
[2.1.2]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v2.1.1...v2.1.2
[2.1.1]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v2.1.0...v2.1.1
[2.1.0]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v2.0.0...v2.1.0
[2.0.0]: https://gitlab.rlp.net/motionbank/systems-frontend/compare/v1.3.10...v2.0.0
......
{
"name": "systems-frontend",
"version": "2.1.1",
"version": "2.1.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "systems-frontend",
"version": "2.1.1",
"version": "2.1.2",
"description": "Combined frontend project for Motion Bank web services",
"productName": "Motion Bank Systems Frontend",
"cordovaId": "org.motionbank.frontend",
......
Subproject commit 277997aafacd58c580bf4b2863e62de8250b05ef
Subproject commit eab6a2726b623649f306b47588c884e029ce7898
Subproject commit 6f75136674e52a26ba7d94a07de07321a881c477
Subproject commit ac9c539828579ce2443528f622896ccea11dac82
......@@ -95,7 +95,10 @@
if (metadata) {
await titleHelper.create(_this.$store, annotation.id, metadata.title)
}
_this.$router.push(`/piecemaker/media/${annotation._uuid}/edit`)
_this.$router.push({
name: 'piecemaker.media.list',
params: { timelineUuid: _this.$route.params.timelineUuid }
})
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment