Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release #326

Merged
merged 10 commits into from
Mar 6, 2023
Merged

Prepare release #326

merged 10 commits into from
Mar 6, 2023

Conversation

jdamerow
Copy link
Member

@jdamerow jdamerow commented Mar 6, 2023

Guidelines for Pull Requests

If you haven't yet read our code review guidelines, please do so, You can find them here.

Please confirm the following by adding an x for each item (turn [ ] into [x]).

  • I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code)
  • I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added)
  • I do not have any sysout statements in my code or commented out code that isn’t needed anymore
  • I am not reformatting any files in the wrong format or without cause.
  • I am not changing file encoding or line endings to something else than UTF-8, LF
  • My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed
  • I have added Javadoc/documentation where appropriate
  • I have added test cases where appropriate
  • I have explained any part of my code/implementation decisions that is not be self-explanatory

Please provide a brief description of your ticket

(you can copy the ticket if it hasn't changed)

...Put description here...

Anything else the reviewer needs to know?

... describe here ...

AvirupBiswas and others added 10 commits June 16, 2022 11:16
* [VSPC-174] implemented the story

* [VSPC-174] fixed code indentation issue

* [VSPC-174] fixed code indentation issue

* [VSPC-174] fixed code indentation issue

* [VSPC-174] fixed code indentation issue

* [VSPC-174] implemented the changes as suggested in PR review comments

* [VSPC-174] fixed the indentation

* [VSPC-174] fixed indentation

* [VSPC-174] fixed indentation

* [VSPC-174] fixed indentation

* [VSPC-174] fixed complex method issue in codefactor

* [VSPC-174] fixed indentation issue

* [VSPC-174] fixed indentation

* [VSPC-174] fixed indentation issue

* [VSPC-174] fixed indentation

* [VSPC-174] fixing code factor issue

* [VSPC-174] fixing code factor issue

* [VSPC-174] fixing code factor issue

* [VSPC-174] fixing code factor issue

* [VSPC-174] implemented the changes as suggested in the PR review comments

* [VSPC-174] implemented the changes as suggested in the PR review comments

* [VSPC-174] chjanges the pointcut so that all the controller inside the package edu.asu.diging.vspace.web will be intercepted

* [VSPC-174] fixed one issue creating URL in module.html

* [VSPC-174] implemented the changes as suggested in PR review comments

* [VSPC-174] implementing the changes as suggested in the PR review comments

* [VSPC-174] added baseUrl in pom and config file

* [VSPC-174] implemented the changes as suggested in PR review comments

* [VSPC-174] added previewid for already existed exhibition

* [VSPC-174] if exhibition is not active still preview can be visible

* [VSPC-174] showing previw link in config page irrrespective of its status

* [VSPC-174] implemented the changes as suggested and discussed with julia

* [VSPC-174] done a minor change

* [story/VSPC-174] codefactor io

* [story/VSPC-174] preview id to exhibition factory

* [story/VSPC-174] added method to interface

* [story/VSPC-174] moved preview id to alert box

* [story/VSPC-174] review comment

* [story/VSPC-174] preview icon alignment on dashboard page

Co-authored-by: Prachi Kharge <[email protected]>
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 8.0.16 to 8.0.28.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](mysql/mysql-connector-j@8.0.16...8.0.28)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* [story/VSPC-213]added exhibitionlanguage codes

* [story/VSPC-213] added configuration for language codes and labels

* [story/VSPC-213] added support for multiple exhibition languages

* [story/VSPC-213] added test cases

* [story/VSPC-213] added code for default language

* [VSPC-213] refactor

* [story/VSPC-213] codefactor

* [story/VSPC-213] refactor

* [story/VSPC-213] revert unwanted file changes

* [story/VSPC-213] review comments

* [story/VSPC-213] modified prefix of exhibition language

* [story/VSPC-213] added exceptions. modified exhibition language config

* [story/VSPC-213] added check for only one default language per exhibition

* [story/VSPC-213] code factor

* [story/VSPC-213] code factor

* [story/VSPC-213] refactor

* [story/VSPC-213] refactor

* [story/VSPC-213] added interface for Exhibition language

* [story/VSPC-213] code factor

* [story/VSPC-213] langauge list config not found added to exception handler

* [story/VSPC-213] refactor

* [story/VSPC-213] modified language list config not found exception

* [story/VSPC-213] refactor

* [story/VSPC-213] review comments

* [story/VSPC-213] removed LanguageListConfigException declaration

* [story/VSPC-213] refactor

* [story/VSPC-213] remove exhibitionlanguage if unselected

* [story/VSPC-213] added test case

Co-authored-by: Prachi Kharge <[email protected]>
* [VSPC-116-2] Adding all the codes from VSPC-116 to handle textBlock
links

* [VSPC-116-2] Adding code to show text blocks on public site

* [VSPC-116-2] Edit text block functionality

* [VSPC-116-2] Fixing script indentation

* [VSPC-116-2] Removing console logs

* [VSPC-116-2]Test case for SpaceTextBlockManager class

* [VSPC-116-2] Addressing review comments

* [VSPC-116] Addressing review comments

* [VSPC-116] TextBlock styling effects and eiditng position.

* [VSPC-116] New UI for TextBlock links

* [VSPC-116] Text Block with new UI

* [VSPC-116] Addressing review comments

* [VSPC-116] Changing button tag and adding padding bottom

* [VSPC-116] Fixing issue occurring on resizing public page

* [VSPC-116] changes done so to adjust height and width of the text on top of the background image in public page

* [VSPC-116]  Implemented the changes as given in the PR comment

* [VSPC-193] Fix for edit module link icon and tooltip

* [VSPC-193] Fix link position while adding or editing a link

* [VSPC-193] Code cleanup

* [VSPC-193] Completed the changes for link position issues on space image

* [VSPC-193] Changes to make link position correct on public page - wip

* [VSPC-193] fixed add and edit link position issue while scrolling the image

* [VSPC-193] fixed add/edit link issue on scrollable image

* [VSPC-193] Added posY back and an offset of 25 to fix the alignment issue

* [VSPC-193] Removed commented code

* Merge branch 'develop' of https://github.com/diging/virtual-spaces-2.0 into story/VSPC-116-2

# Conflicts:
#	vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSpaceController.java
#	vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java
#	vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
#	vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html

* Merge branch 'develop' of https://github.com/diging/virtual-spaces-2.0 into story/VSPC-116-2

# Conflicts:
#	vspace/src/main/java/edu/asu/diging/vspace/web/publicview/ExhibitionSpaceController.java
#	vspace/src/main/java/edu/asu/diging/vspace/web/staff/SpaceController.java
#	vspace/src/main/webapp/WEB-INF/views/exhibition/space.html
#	vspace/src/main/webapp/WEB-INF/views/staff/spaces/space.html

* [VSPC-116] Textblock issues are fixed

* [VSPC-116] Added failed unit tests scenarios

Refactored UI code as per review comments

* [VSPC-116] Fixed indentation issue

* [VSPC-116] Made text block resizable while editing

Updated font-size to match it with the exhibition page
Made the background slightly transparent

* [VSPC-116] Changed code to jquery

Made modal background image height and width as global variables and initializing them when the modal opens.

* [VSPC-116] Fixed the bug where the textBlock was loading twice on the exhibition page

Changed Indentation

Co-authored-by: Avirup Biswas <[email protected]>
Co-authored-by: Pradeep Kumar <[email protected]>
Co-authored-by: swetalina-prusty25 <[email protected]>
Co-authored-by: Tushar Anand <[email protected]>
Co-authored-by: Tushar Anand <[email protected]>
* [bug/VSPC-198] debugging

* [bug/VSPC-198] changed attr to prop()

* [bug/VSPC-198] removed logger statements

Co-authored-by: Prachi Kharge <[email protected]>
* Bump spring-security-core from 5.3.10.RELEASE to 5.5.7 in /vspace

Bumps [spring-security-core](https://github.com/spring-projects/spring-security) from 5.3.10.RELEASE to 5.5.7.
- [Release notes](https://github.com/spring-projects/spring-security/releases)
- [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc)
- [Commits](spring-projects/spring-security@5.3.10.RELEASE...5.5.7)

---
updated-dependencies:
- dependency-name: org.springframework.security:spring-security-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* [story/VSPC-230] added property

* [story/VSPC-230]modified spring version

* [story/VSPC-230] modified hibernate version

* [story/VSPC-230] javers version

* [story/VSPC-230] removed property

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Prachi Kharge <[email protected]>
Bumps [hibernate-core](https://github.com/hibernate/hibernate-orm) from 5.4.12.Final to 5.4.24.Final.
- [Release notes](https://github.com/hibernate/hibernate-orm/releases)
- [Changelog](https://github.com/hibernate/hibernate-orm/blob/5.4.24/changelog.txt)
- [Commits](hibernate/hibernate-orm@5.4.12...5.4.24)

---
updated-dependencies:
- dependency-name: org.hibernate:hibernate-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* [VSPC-205] chaged the values of dropdown menu for a sequence

* [bug/VSPC-206] Editing a sequence title, fixed the input box size and buttons

* [bug/VSPC-206] fixed the css changes for input box and buttons

* [bug/VSPC-206] title and description input fields are aligned and fixed the save and cancel button

* [bug/VSPC-206] changed the code to fix the column issue

* [bug/VSPC-206] fixed the input filed size issue

* [bug/VSPC-210] Implemented the direct link to a space in staff side to the public space.

* [bug/VSPC-210] added link to the public side of a spac

* [bug/VSPC-210] removed unwanted file which is sequence.html

* [bug/VSPC-210] copied the latest sequence.html file from develop

* [bug/VSPC-210]changed buttons to link

* [bug/VSPC-232] added hover text
* [VSPC-120] CSS changes

* [VSPC-120] Changes for thymeleaf to setupComplete.jsp.

* [VSPC-120] Navbar css changes and module links

* [VSPC-120] Changed passwordChange.jsp to thymeleaf

* [VSPC-120]Migrating register.jsp to thymeleaf

* [VSPC-120]Migrating resetPassword and resetRequestSent to Thymeleaf.

* [VSPC-120] Changes to setup and setupComplete pages

* [VSPC-120]Exhibition module link display

* [VSPC-120] Changes to load module and space links load

* [VSPC-12] migration to thymeleaf

* [VSPC-120] Migrated badrequest.jsp to thymeleaf

* [VSPC-120] Migrated maintenance.jsp to thymeleaf

* [VSPC-120] fixed module links modal

* [VSPC-120] COmpleted module.jsp

* [VSPC-120] Completed the changes for setup and setupComplete pages.

* [VSPC-120]Fixing next previous icons and repetitive slide title

* [VSPc-120] CSS changes on space.jsp

* [VSPC-120] Minor Thymeleaf changes

* [VSPC-120] Setup and setupcomplete style changes

* [VSPC-120] Staff side main file and navbar

* [VSPC-120]Dashboard initial layout

* [VSPC-120] Started migration of edit.jsp

* [VSPC-120] changed formatting

* [VSPC-120]deleting dashboardlist and adding dashboard.html

* [VSPC-120]Dashboard style changes and adding fragment for dashboard menu

* [VSPC-120]modulelist and module jsp to thymeleaf

* [VSPC-120] Started migration of image.jsp

* [VSPC-120] Changes to add and edit in staff side spaces folder.

* [VSPC-120] Changing to bootstrap 4.1.2

* [VSPC-120] Fixing side menu for spaces and modules add

* [VSPC-120] Dashboard changes with respect to new bootstrap style used

* [VSPC-120] User list

* [VSPC-120] Module file changes for thymeleaf

* [VSPC-120] Migrated image.jsp to thymeleaf

* [VSPC-120] Migrated spacelist.jsp and fixed userlist loading

* [VSPC-120]BranchingPoint and slidesInSequence Load to thymeleaf

* [VSPC-120]Add module to thymeleaf

* [VSPC-120]staff sequence add jsp to thymeleaf

* [VSPC-120] Modified controllers

* [VSPC-120] Started migration of imagelist.jsp

* [VSPC-120]Adding delete modal for slides in for module.html

* [VSPC-120] Migrated exhibit folder

* [VSPC-120] Migration of Javascript code to thymeleaf

* [VSPC-120]Add and show slide content thymeleaf

* [VSPC-120] shifted h1 tag

* [VSPC-120] Migrated scattered files and modified controllers.

* [VSPC-120] Slide add and slide content to thymeleaf

* [VSPC-120]Adding lists contains function and replacing data-feather tags

* [VSPC-120]Fixing users list load problems

* [VSPC-120]Fixng list load and delete modal for spacelist.html

* [VSPC-120] Space.html added for thymeleaf migration.

* [VSPC-120]Migrating imagelist to thymeleaf

* [VSPC-120] Exhibition config

* [VSPC-120] staff space loads but ajax urls don't work.

* [VSPC-120]Resolving conflicts

* [VSPC-120]image load and migration to thymeleaf

* [VSPC-120]Edit image html load and migration to thymeleaf

* [VSPC-120]staff space migration to thymeleaf

* [VSPC-120] Fixing links for delete space and updating required flags

* [VSPC-120] added badrequest in views

* [VSPC-120] Minor changes

* [VSPC-120]space to thymeleaf

* [VSPC-120]Add Space multipart csrf token fix

* [VSPC-120] Add space to thymeleaf image list fix

* [VSPC-120] Edit.html for staff spaces complete,change in slides edit
page

* [VSPC-120]Fixing overlapping of submit button space on edit icon

* [VSPC-120]Adding footer to the staff screens

* [VSPC-120] Changed navbar and sidenav

* [VSPC-120]Changes for register user and exhibit space sideNav fix

* [VSPC-120] Adding background to sidenav bar

* [VSPC-120] Fixing codefactor issues

* [VSPC-138] Dashboard main content and footer

* [VSPC-120]Removing .project

* [VSPC-120] Trying to undo formating for pom.xml

* [VSPC-120]changing encoding

* [VSPC-120] changed file endings to Unix

* [VSPC-138] Completed dashboard and config page

* [VSPC-120] Changed markdown text to rendered in public module page.

* [VSPC-120]Fixing Line endings

* [VSPC-120] Fixing code factor warning

* [VSPC-120] Fixing edit space button click issue

* [VSPC-120]Deleting deleteModal as the file is not being used

* [VSPC-120] spaceList icons for unpublished spaces and incoming links

* [VSPC-138] Staff: Space page

* [VSPC-120] Trying to fix indentation

* [VSPC-120] Trying to fix pom.xml indentation

* [VSPC-120] Trying to revert .project changes and pom indentation

* [VSPC-120]Fixing indentation

* Delete .project

deleting .project file

* [VSPC-120] .classpath line endings

* [VSPC-120] Deleting servlet-context.xml

* [VSPC-138] Completed top level pages

* [VSCP-138] Staff: Space page WIP

* [VSPC-115] Added block for adding video to slides page. Also merged with
VSPC-120.

* [VSPC-120]Removing console logs and fixing line ending

* [VSPC-138] Staff: Main space page, changing link modals

* [VSPC-120]Converting line endings to Unix

* [VSPC-120] Fixing length zero no unit code factor.

* [VSPC-138] Staff: main space > create link popups

* [VSPC-120]Setting char encoding for template and view resolver

* [VSPC-120] Review comments UI changes

* [VSPC-138] Main module page & Sequences

* [VSPC-120] UI fixes with respect to review comments

* [VSPC-120] Adding space edit icon

* [VSPC-138] Sequences

* [VSPC-138] Fixed merge conflicts

* [VSPC-115] Incomplete changes for ajax calls in video addition to slides

* [VSPC-120] UI changes to for review comments.

* [VSPC-120]Fixing button colors, paddings and other UI issues

* [VSPC-120] Changing link colors

* [VSPC-138] Completed Sequences Page, working on Slides

* [VSPC-120]Fixing icon alignments

* [VSPC-120] Trying to fix some failing spaces in new layout

* [VSPC-120] Fixing codefactor length zero unit

* [VSPC-120] Fixing 0 length codefactor

* [VSPC-120]link null checks

* [VSPC-120]deleting line to check the problem

* [VSPC-120] reverting changes made to test the code.

* [VSPC-120] Checking null target space

* [VSPC-138] Lots of CSS changes

* [VSPC-120] Space not loading issue

* [VSPC-120]Space load issue fix 1

* [VSPC-120]Added script for sortable and code to fix selectable slides

* [VSPC-138] Staff> Slides page

* [VSPC-120]Fix for edit sequences

* [VSPC-120] Edit sequence final fixes

* [VSPC-120] Button size and color and branching choices select fixes

* [VSPC-120]fixing visibility of info icon and module type dropdown

* Revert "Merge branch 'story/VSPC-120' into VSPC-138"

This reverts commit aeab0ec, reversing
changes made to 9cff0b8.

* [VSPC-138] Preparing for merge with 120

* [VSPC-120] Edit slide fixes and style fixes

* [VSPC-120] Public site style fixes with respect to nav-bar

* [VSPC-120] Space exhibition fix

* [VSPC-120] Length zero code factor fixex

* [VSPC-120] New layout fixes with respect to review comments

* [VSPC-115] Changes to videoCOntroller for uploaded files and video url.

* [VSPC-120] UI fixes and additions from old layout.

* [VSPC-120]Fix for overflowing text space between grid elements

* [VSPC-120] trying to fix width and fit content.

* [VSPC-120]Fixing styles for smaller screens

* [VSPC-120]Adding slide button to modules page

* [VSSPC-115] Adding functionality for ediing videos added.

* [VSPC-120]Fixing Slide Text, Image and Choice blocks and exhibition
styles

* [VSPC-120] Text div styles

* [VSPC-120]Exhibition and sequence links on choice content block

* [VSPC-115] Changes to edit functionality for videos on slides.

* [VSPC-120]Fixes for adding new space and delete slide

* [VSPC-120]Space list and SpaceImageList fix

* [VSPC-120] Slide edit and image size fix

* [VSPC-120]Changes to show sequences and addressing other review comments

* [VSPC-115] Added delete functionality and changes to edit functionality.

* [VSPC-120] Removed nullpointer error when no exhibition is setup.

* [VSPC-120] Fixed error when no startSpace is set for exhibition.

* [VSPC-120] Fixing edit text block and branching point title on slides

* [VSPC-120] Removing console logs and fixing link color in list.

* [VSPC-120] Deleting jsp files and tiles_defs config file

* [VSPC-115] Fixed minor bugs and added only one form of video insertion.

* [VSPC-115] Formatting changes.

* [VSPC-120]Changing line endings to UNIX.

* [VSPC-115] Changes based on review comments.

* [VSPC-115] Changes based on review comments.

* [VSPC-115] Changes based on review comments.

* [VSPC-115] Changes to formatting and review comments.

* [VSPC-115] Formatting changes for slides.html.

* [VSPC-115] Added test cases for videoFactory class.

* [VSPC-115] Merged with develop branch.

* [VSPC-115] Merged with develop branch.

* [VSPC-115] Test cases for VideoBlockFactory class.

* [VSPC-115] Code claning and readability changes.

* [VSPC-115] Comments for IVSMedia class.

* [VSPC-115] Changes as per review comments.

* [VSPC-115] Added few fixes after merge

* [VSPC-115] Added few fixes after merge.

* [VSPC-115] Changes to public page to add title

* [VSPC-115] Added codeFactor fixes.

* [VSPC-115] Added indentation fix to ImageAPIController

* [VSPC-115] implemented the changes as suggested in PR review comments

* [VSPC-115] fixed codefactor issue

* [VSPC-115] implemented changes as suggested in PR review comments

* [VSPC-115] done some CSS changes so that UI look compatible with the existing UI

* [VSPC-115] added unit test cases

* [VSPC-115] implemented the changes as suggested in the PR review comments

* [VSPC-115] fixed aindentation issue along with fixed the issue regarding embedding mov file

* [VSPC-115] fixed indentation issue

* [VSPC-115] indentation fix

* [VSPC-115] indentation fix

* [VSPC-115] indentation fix

* [VSPC-115] changed the note to upload certain types opf videos only

* [VSPC-115] removed one semicolon

* [VSPC-115] added the backend code to update only the video title

* [VSPC-115] video title now can be edited

* [VSPC-115] console.log removed

* [VSPC-115] implemented the changes as suggested in the PR review comments

* [VSPC-115] updated the button name while editing the video block

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] testing in staging server

* [VSPC-115] impleted the changes so that the issue while deleteing and editing video will not take place

* [VSPC-115] Made minor review comment related changes

* [VSPC-115] Added one test case for video upload scenario

* [VSPC-115] Added missing test cases

* [VSPC-115] changed indentation

* [VSPC-115] removed null check

* [VSPC-115] line endings

* [VSPC-115] changed to LF

* [VSPC-115] Updated CR LF to LF

* [VSPC-115] removed unused import

---------

Co-authored-by: adhvikmadhav <[email protected]>
Co-authored-by: skhar <skhar@DESKTOP-94NFI4U>
Co-authored-by: ashmichheda <[email protected]>
Co-authored-by: Prashant Ravindra Jadhav <[email protected]>
Co-authored-by: Prashant Ravindra Jadhav <[email protected]>
Co-authored-by: skhar <skhar@DESKTOP-66MU1OA>
Co-authored-by: AvirupBiswas <[email protected]>
Co-authored-by: Tushar Anand <[email protected]>
@jdamerow jdamerow merged commit f924cbb into master Mar 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants