Skip to content

Commit

Permalink
Merge pull request #518 from TAMULib/staging
Browse files Browse the repository at this point in the history
Staging
  • Loading branch information
kaladay authored Dec 13, 2022
2 parents f0637db + d738fa9 commit 9a555c0
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 9 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# Changelog

## [2.0.5] - 12-02-22
### Resolves

- WYSIWYG save is not working. (#516)

## [2.0.4] - 11-15-22
### Resolves

- Remove the "upgrade" button from the tinymce editor. (#512)
- Locked the node version to 16. (#515)

## [2.0.3] - 10-12-22
### Resolves

- Fix bad error handling and reporting wvr-button. (#504)
- Footer Becoming Sticky when it should not. (#503)
- Remove ng-inline-svg as it is no longer maintained. (#502)
- Redesign dependency list, reducing dependencies where possible. (#507)
- Fixed tabs to no longer need a wrapping div to display content. (#505)

## [2.0.2] - 09-19-22
### Resolves

Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type": "git",
"url": "git+https://github.com/TAMULib/weaver-components.git"
},
"version": "2.0.4",
"version": "2.0.5-rc.1",
"private": false,
"license": "MIT",
"engines": {
Expand Down Expand Up @@ -63,6 +63,8 @@
"dependencies": {
"@angular/animations": "12.2.16",
"@angular/elements": "12.2.16",
"@angular/forms": "12.2.16",
"@angular/localize": "12.2.16",
"@angular/platform-browser-dynamic": "12.2.16",
"@ng-bootstrap/ng-bootstrap": "10.0.0",
"@ngrx/effects": "12.5.1",
Expand All @@ -76,7 +78,7 @@
"tinymce": "6.2.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.2.18",
"@angular-devkit/build-angular": "12.2.16",
"@angular-eslint/eslint-plugin": "14.1.2",
"@angular-eslint/eslint-plugin-template": "14.1.2",
"@angular/cli": "12.2.16",
Expand Down Expand Up @@ -124,6 +126,7 @@
"zone.js": "0.11.8"
},
"overrides": {
"@angular/compiler": "12.2.16",
"@angular/core": "12.2.16",
"@types/eslint": "6.8.1",
"chokidar": "3.5.3",
Expand Down
2 changes: 1 addition & 1 deletion projects/wvr-elements/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@wvr/elements",
"version": "2.0.4",
"version": "2.0.5-rc.1",
"description": "Collection of angular components for Weaver's Custom Web Component UI",
"author": "Texas A&M University Libraries",
"private": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ export class WvrWysiwygComponent extends WvrBaseComponent implements OnInit, OnD
base_url: 'tinymce',
skin: 'oxide',
plugins: [
'advlist autolink lists link image charmap print',
'preview anchor searchreplace visualblocks code',
'fullscreen insertdatetime media table paste',
'help wordcount print preview save'
"advlist", "autolink", "lists", "link", "image", "charmap", "print",
"preview", "anchor", "searchreplace", "visualblocks", "code",
"fullscreen", "insertdatetime", "media", "table", "paste",
"help", "wordcount", "print", "preview", "save"
],
toolbar: 'undo redo | formatselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table pagebreak | charmap codesample image | removeformat | help | cancel save',
toolbar: 'undo redo | print formatselect | bold italic forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table pagebreak | charmap codesample image | removeformat | help | cancel save',
menu: (wvrEditor as any).default,
height: '300',
/* TODO: Issue #316. */

save_oncancelcallback: $event => {
this.onReset($event);
},
Expand Down

0 comments on commit 9a555c0

Please sign in to comment.