Skip to content

Prepare release #355

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.

Sign up for GitHub

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

Jump to bottom
Merged
jdamerow merged 28 commits into from
Jun 18, 2025
Merged

Prepare release #355

jdamerow merged 28 commits into from
Jun 18, 2025

Conversation

@jdamerow
Copy link
Member

@jdamerow jdamerow commented Jun 18, 2025

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 ...

pkharge and others added 28 commits April 18, 2023 13:07
@pkharge
Story/vspc 229 (#309)
72ebf8c 
* [story/VSPC-229] added two new buttons for alerts

* [story/VSPC-229] modified icons

* [story/VSPC-229] code factor

* [story/VSPC-229] review commetns

 # [story/VSPC-229]

* [story/VSPC-229]

* [story/VSPC-229] refactor

* [story/VSPC-229] refactor

* [story/VSPC-229] preview icon

* [story/VSPC-229] css side nav

* [story/VSPC-229] refactor

* [story/VSPC-229]

* [story/VSPC-229]

* [story/VSPC-229] added to navbar

* [story/VSPC-229] css

* [story/VSPC-229] css

* [story/VSPC-229] css

* [story/VSPC-229 review comment css]

* [story/VSPC-229] module bug fix

---------

Co-authored-by: Prachi Kharge <prachikharge@Prachis-MacBook-Air.local>
@bnayak4 @jdamerow
story/vspc-243 (#327)
961ba17 
* [VSPC-244] junit written

* [VSPC-244] addressed review comments

* [VSPC-245] ticket done

* [VSPC-245] ticket done

* [VSPC-247] test case is done

* [VSPC-247] addressed ticket:

* [VSPC-248] ticket done

* [VSPC-248] junits

* [VSPC-250] javadoc

* [VSPC-251] ticket done

* [VSPC-243] Junits and java doc written

* [VSPC-252] junits written

* [VSPC-254] Junits and javadoc done

* [VSPC-243] junits and javadoc

* [VSPC-243] Fixed method names

* [VSPC-243] formatting fixes

---------

Co-authored-by: Julia Damerow <jdamerow@users.noreply.github.com>
@dependabot
Bump commons-fileupload from 1.3.3 to 1.5 in /vspace (#324)
5423326 
Bumps commons-fileupload from 1.3.3 to 1.5.

---
updated-dependencies:
- dependency-name: commons-fileupload:commons-fileupload
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@swetalina-prusty25 @dependabot
Dependabot/maven/vspace/com.fasterxml.jackson.core jackson databind 2…
f9ffdcc 
….12.6.1 (#322)

* Bump jackson-databind from 2.10.0.pr1 to 2.12.6.1 in /vspace

Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.10.0.pr1 to 2.12.6.1.
- [Release notes](https://github.com/FasterXML/jackson/releases)
- [Commits](https://github.com/FasterXML/jackson/commits)

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1] Fixed Exceptions

* [VSPC-231] Exhibition Page is loading

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1] date error

* [VSPC-231] Exhibition page is loading

* [VSPC-231]conflicts

* [VSPC-321] error resolved

* [VSPC-231] review comments

* [VSPC-231]pom file

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1]Review Comment

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1] Pom.xml file

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1]Formatting

* [dependabot/maven/vspace/com.fasterxml.jackson.core-jackson-databind-2.12.6.1]Duplicating lines

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@glendsouza1702 @pkharge
Story/vspc 202 Upload files (#298)
75eba4d 
* [VSPC-202] File init

* [VSPC-202] File Api's

* [VSPC-202] backend changes

* [VSPC-202] Frontend changes

* [VSPC-202] File Form

* [VSPC-202] File edit

* [VSPC-202] Download file

* [VSPC-202] Downloading, Renaming and deletion of files

* [VSPC-202] file delete and ui changes

* [VSPC-202] Unit tests and refactor

* [VSPC-202] refactor

* [VSPC-202] Indentation fix

* [VSPC-202] Indentation fix

* [VSPC-202] Indentation fix

* [VSPC-202] Indentation fix

* [VSPC-202] indentation fix

* [VSPC-202] Indentation fix

* [story/VSPC-204] addressed review comments

* [story/VSPC-202] code factor

* [story/VSPC-202] download button

* [story/VSPC-202] headers in download file

* [story/VSPC-202] download file without javascript

* [story/VSPC-202] test case name change

* [story/VSPC-202]

* [story/VSPC-202] fixed test case

* [story/VSPC-202] modified path to maintenance html file

* [story/VSPC-202] removed unwanted imports

* [story/VSPC-202] code factor

* [story/VSPC-202] code factor

* [story/VSPC-202] code factor

* [story/VSPC-202] modified IVSImage to extend IVSFile

* [story/VSPC-202] ivsimage and ivsfile

* [story/VSPC-202] added IVSMedia and VSMedia mapped super class

* [story/VSPC-202] parentpath

* [story/VSPC-202] refactor

* [story/VSPC-202] fixed test cases

* [story/VSPC-202] review comments

* [story/VSPC-202] add file api modified

* [story/VSPC-202] delete file api response

* [story/VSPC-202] removed unwanted imports

* [story/VSPC-202] test case

* [story/VSPC-202] code factor

* [story/VSPC-202] removed unwanted imports

* [story/VSPC-202] review comment

* [story/VSPC-202] ui changes

* [story/VSPC-202] icon

* [story/VSPC-202] addressed review comments

* [story/VSPC-202]review comments

* [story/VSPC-202] pagination backend

* [story/VSPC-202] paginagte

* [story/VSPC-202] review comment

* [story/VSPC-202] removed unwanted changes

* [story/VSPC-202]

* [story/VSPC-202]

* [story/VSPC]

* [story/VSPC-202]

* [story/VSPC-202] fixed test cases

* [story/VSPC-202] page number

* [story/VSPC-202] review comments

* [story/VSPC-202] edit api

* [story/VSPC-202] review comment

* [story/VSPC-202] download file and delete file ui

* [story/VSPC-202] test case

* [story/VSPC-202] test case

* [story/VSPC-202] redirect from edit file

* [story/VSPC-202] file upload success message

* [story/VSPC-202] conflicts resolved

* [story/VSPC-202] refactor

* [story/VSPC-202 ] alerts thymeleaf

* [story/VSPC-202] javascript alert

* [story/VSPC-202]

* [story/VSPC-202] review comments

* [story/VSPC-202] review comment

* [story/VSPC-202] review comments

---------

Co-authored-by: Prachi Kharge <prachikharge@Prachis-MacBook-Air.local>
Co-authored-by: pkharge <pkharge@asu.edu>
@swetalina-prusty25
Bug/vspc 218 (#317)
67604ca 
* [VSPC-205] chaged the values of dropdown menu for a sequence

* ongoing

* [bug/VSPC-218] worked on the controller

* [bug/VSPC-218] Implemented the story

* Update ModuleLinkRepository.java

* Update IModuleLinkManager.java

* Update ModuleLinkManager.java

* Update IModuleLinkManager.java

* Update ModuleController.java

* [bug/VSPC-218] Review Changes

* Update ModuleController.java

* Update ModuleController.java

* Update ModuleController.java

* Update ModuleController.java

* Update ModuleController.java

* [bug/VSPC-232] fixed according to review comment

* [bug/VSPC-232]

* [bug/VSPC-218] Addressed Review Comments

* [bug/VSPC-218] Code changed accr to review comments

* [bug/VSPC-218] review comment

* [bug/VSPC-218]REview comment

* [bug/VSPC-218]Recent review comment

* [bug/VSPC-218] Review comments

* [bug/VSPC-218] Linked space page

* [story/VSPC-218] Review comments
@swetalina-prusty25
Bug/vspc 268 (#329)
c0a95df 
* [bug/VSPC-268]CSS changes

* [bug/VSPC-268] Fixed layout issue
@swetalina-prusty25
Bug/vspc 241 (#331)
748906d 
* [bug/VSPC-241]CSS changes

* [bug/VSPC-241] Fixed the issue
@swetalina-prusty25
Bug/vspc 240 (#332)
e0952a5 
* [bug/VSPC-240] Inspect the issue

* [bug/VSPC-240]Fixed the bug
@dependabot
Bump org.apache.tika:tika-core from 1.22 to 1.28.3 in /vspace (#334)
f908bff 
Bumps [org.apache.tika:tika-core](https://github.com/apache/tika) from 1.22 to 1.28.3.
- [Changelog](https://github.com/apache/tika/blob/1.28.3/CHANGES.txt)
- [Commits](apache/tika@1.22...1.28.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pkharge @jdamerow @pradeep-017
Story/vspc 233 (#335)
2471500 
* [VSPC-199] Fixed the link issue with null targetSpace (#272)

* [VSPC-199] Fixed the link issue with null targetSpace

* [VSPC-199] Making changes more DRY

* [VSPC-199] reverse OR arguments

* [VSPC-199] Added title for inactive links

Co-authored-by: Julia Damerow <jdamerow@users.noreply.github.com>

* [VSPC-233] added backend to store color

* VSPC-233 html input color wheel

* [VSPC-233] text color applied

* [VSPC-233] update color workig

* [VSPC-233] added dynamic color to borders

* [VSPC-233] change border-color

* [VSPC-233] border color working

* [VSPC-233] refactor

---------

Co-authored-by: Julia Damerow <jdamerow@users.noreply.github.com>
Co-authored-by: Pradeep Kumar <56213738+pradeep-017@users.noreply.github.com>
@pooja-thalur @swetalina-prusty25
Bug/vspc 207 (#340)
84a4722 
* [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-207] implemented search button to search images until developing end point

* [bug/VSPC-207] completed the development for adding search field for images tab

* [bug/VSPC-207] removed sequence.html file

* [bug/VSPC-207] removed identation error from this file

* [bug/VSPC-207] changed the code based on the review comment

* [bug/VSPC-207] Implemented pagination for search images

* [bug/VSPC-207]

* [bug/VSPC-207] Removed the conflict from java files

* [bug/VSPC-207] Fixed code conflicts

* [bug/VSPC-207] Resolved code conflict

* Update ImageRepository.java

* Update IImageService.java

* Update ImageService.java

* Update searchImages.html

* Update ImageSearchApiController.java

* Update ImagesSearchFullApiController.java

* Update ImageSearchApiController.java

* Update ImagesSearchFullApiController.java

* Update ImageSearchApiController.java

* Update ImagesSearchFullApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImagesSearchFullApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImageSearchApiController.java

* Update ImagesSearchFullApiController.java

* [bug/VSPC-207] Changed code according to the PR Review Comment

* [bug/VSPC-207]Removed identation error

* [bug/VSPC-232] addressed review comment

* [bug/VSPC-207] Addressed review comments

* [bug/VSPC-207] Addressed review comments

* [bug/VSPC-207] Addressed review coments

* [bug/VSPC-207] Resolved the conflicts

* [bug/VSPC-207] Removed extra spaces

* [bug/VSPC-207]removed extra spaces

* [bug/VSPC-207] removed extra spaces

* [bug/VSPC-207]spaces

* [bug/VSPC-207]Review comment

* [bug/VSPC-207]Addressed Review comments

* [bug/VSPC-207]Code style, spelling check, indentation

* [bug/VSPC-207]Review comments

* Resolved few indentation issues and addressed pr comment

* fixed the issue with pagination and added a clear search link to clear search results

* fixed an indentation issue

* converting it to an inline condition

* removed unnecessary spaces

* removed extra spaces

* Code cleanup

* Code cleanup

* indentation fix

* ui changes for search in images section

* addressed review comments

* [VSPC-207] addressed pr comments

* [VSPC-207] addressed pr comments - fixed sort issue

* [VSPC-207] fixed the tag issue

* [VSPC-207] Fixed the count issue

* [VSPC-207] resolved codefactor issue of complex method

* [VSPC-207] resolved codefactor issue

* [VSPC-207] codefactor issue

* [VSPC-207] refactored the code

* [VSPC-207] addressed pr comments

* [VSPC-207] fixed issue with tag selection

* [VSPC-207] addressed pr comments

---------

Co-authored-by: swetalina-prusty25 <sprusty1@asu.edu>
Co-authored-by: swetalina-prusty25 <100608518+swetalina-prusty25@users.noreply.github.com>
@dependabot
Bump org.springframework.security:spring-security-core in /vspace (#338)
89ac3e0 
Bumps [org.springframework.security:spring-security-core](https://github.com/spring-projects/spring-security) from 5.5.7 to 5.7.12.
- [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.5.7...5.7.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pooja-thalur
[VSPC-272] creating exhibition object when no exhibition is found (#347)
dcb5d21 
* [VSPC-271] creating exhibition object when no exhibition is found

* [VSPC-272] addressed pr comments

* [VSPC-272] removed unnecessary imports
@pooja-thalur
[VSPC-270] Color Adjustment Not Reflected in Preview (#349)
5014278 
* [VSPC-270] js changes to apply color adjustments

* [VSPC-270] fixed indentation
@swetalina-prusty25 @bnayak4 @pooja-thalur
Story/vspc 243 (#330)
fdcf51a 
* [VSPC-244] junit written

* [VSPC-244] addressed review comments

* [VSPC-245] ticket done

* [VSPC-245] ticket done

* [VSPC-247] test case is done

* [VSPC-247] addressed ticket:

* [VSPC-248] ticket done

* [VSPC-248] junits

* [VSPC-250] javadoc

* [VSPC-251] ticket done

* [VSPC-243] Junits and java doc written

* [VSPC-252] junits written

* [VSPC-254] Junits and javadoc done

* [VSPC-243] junits and javadoc

* []Added java doc

* [VSPC-258] Java doc

* [VSPC-258]Updated java doc

* [VSPC-259] Added tests and java doc

* [VSPC-262]Java doc

* [VSPC-263]Added java doc

* [VSPC-264] Tests

* [VSPC-265] Added java doc and tests

* [VSPC-266] Tests and java doc

* [VSPC-267] Tests

* [VSPC-258]Test cases

* [VSPC-259] Tests

* [VSPC-259] fixed test case issue

---------

Co-authored-by: Baishali Nayak <bnayak4@asu.edu>
Co-authored-by: pooja-thalur <poojathalur@yahoo.com>
@pkharge @pooja-thalur
Story/vspc 269 - left menu not scrolling issue (#337)
90fd37c 
* [VSPC-269] add position relative

* [VSPC-269] scroll added

* [VSPC-269]

* [VSPC-269]

* [VSPC-269] footer was not at the bottom

* [VSPC-269] reverted css change

* [VSPC-269] made footer stick at the bottom

* [VSPC-269] fixing css

---------

Co-authored-by: pooja-thalur <poojathalur@yahoo.com>
@pooja-thalur
[VSPC-273] added stylesheet to show the remove icon (#346)
763d80b 
* [VSPC-273] added stylesheet to show the remove icon

* [VSPC-273] added stylesheet in layout template

* [VSPC-273] included script in layout files

* [VSPC-273] changed version of script

* [VSPC-273] resolved js error
@pooja-thalur @glendsouza1702
@bnayak4 @pkharge
Story/vspc 99 - overview image of where a user is in a module (#342)
380379d 
* [VSPC-99] Module overview implementation

* [VSCPC-99] Module Overview controller and manager

* [VSPC-99] Front end of network graph and sequence overview backend logic

* [VSPC-99] Module overview changes

* [VSPC-99] sequence display

* [VSPC-99] Adding slides into network graph

* Update module.html

* [VSPC-99] module.html changes

* Update module.html

* [VSPC-99] displaying the bubble texts

* [VSPC-99] Highlight current slide

* [VSPC-99] Tree map implementation

* [VSPC-99] Depth reduced in tree

* [VSPC-99] close overview modal

* [VSPC-99] Button class changed

* [VSPC-99] cleanup

* [VSPC-99] cleanup

* [VSPC-99] Cleanup

* [VSPC-99] Code Cleanup

* [VSPC-99] Code Cleanup

* [VSPC-99] unit test and fixes

* [VSPC-99] unit test

* [VSPC-99] Code cleanup

* [VSPC-99] removing redundant null check

* [VSPC-99] PR review comments

* [VSPC-99] PR review comments

* [VSPC-99] fixed unit test

* [VSPC-99] addressing pr review comments

* [VSPC-99] increasing distance between nodes

* Merge branch 'develop' into story/vspc-99

* [VSPC-99] Indentation

* [VSPC-99] removing console log

* [VSPC-99] Branching point added to sequenceoverview

* [VSPC-99] Changing module overview and added slide overview

* [VSPC-99] front end changes with slide overview

* [VSPC-99] Adding branching point to the tree

* [VSPC-99] Disallowing self loop

* [VSPC-99] Removed toggle of nodes and aligned graph

* [VSPC-99] moving module map button to an icon

* [VSPC-99] Fix indentation

* Update SequenceOverviewManagerTest.java

* [VSPC-99] addressed comments

* [VSPC-99] Added console logs to test till where it is being pinged

* [VSPC-99] added toottiptext and resolved issues

* [VSPC-99] codefactor.io issues removed

* [VSPC-99] added changes to address review comments

* [VSPC-99] added changes to address PR

* [VSPC-99] making changes from backend

* [VSPC-99] added changes to remove review coments

* [VSPC-99]Added changes in the front end to show only the slides

* [VSPC-99] adding the slides links and nodes

* [VSPC-99] checked the pom.xml changes as asked in the PR

* [VSPC-99] added PR review comments

* [VSPC-208] was not getting slides

* [VSPC-99] resolved merge conflicts

* [VSPC-99] added changes for review comments

* [VSPC-99] refactored

* [VSPC-99] addressed review comments

* [VSPC-99] addressed review comments to generate map

* [VSPC=99] addressed review comments

* [VSPC-99] refactor

* [VSPC-99] working on removing first nodes

* [VSPC-99] removed root node from display

* [VSPC-99] remove sequence node

* [VSPC-99] try to remove extra link

* [VSPC-99] fixed css

* [VSPC-99] review comment

* [VSPC-99]  review comment

* [VSPC-99] tried to modify x and y coordinates of links

* [VSPC-99] branching point keep straight line for slides

* [VSPC-99]  while loop for all slide nodes

* [VSPC-99] straight line

* [VSPC-99] review comments

* [VSPC-99] refactor

* [VSPC-99] refactor

* [VSPC-99] review comments

* [VSPC-99] revert pom xm

* [VSPC-99] review comments

* [VSPC-99]

* fixed js error and indentation issue

* addressed pr comments

* indentation issue fixed

* unnecessary changes

* removing spaces

* removing unnecessary changes

* removed spaces

* removed spaces

* indentation fix

* indentation fixes

* indentation fix

* unit test

* [VSPC-99] Addressed pr comments

* [VSPC-99] UI changes to make the nodes clickable

* [VSPC-99] addressed the pr comments

* [VSPC-99] Code cleanup

* [VSPC-99] made the node clickable

* [VSPC-99] addressed pr comments

* [VSPC-99] added scroll

* [VSPC-99] removed branching point node

* [VSPC-99] removed branch point

* [VSPC-99] removed the branching point

* [VSPC-99] fixed indentation

* [VSPC-99] fixed the error in js

* [VSPC-99] changes to the module overview

* [VSPC-99] changes for pointing the branching point to a previous sequence

* [VSPC-99] fixed issue with line pointing previous sequence

* [VSPC-99] code change to show a graph/network structure

* [VSPC-99] js changes to link nodes

* [VSPC-99] changes to show network

* [VSPC-99] handling usecases

* [VSPC-99] adding branches to node

* [VSPC-99] path link changes

* [VSPC-99] code cleanup

* [VSPC-99] changed the modal size

* [VSPC-99] code cleanup and modal resizing

---------

Co-authored-by: glend17 <glendsouza1702@gmail.com>
Co-authored-by: Baishali Nayak <bnayak4@asu.edu>
Co-authored-by: pkharge <pkharge@asu.edu>
@glendsouza1702 @bnayak4
@pkharge @ajay3568yadav
Story/vspc 171 (#266)
d144439 
* [VSPC-171] Added new SpaceBlock

* [VSPC-171] Added SpaceBlock type functionality

* [VSPC-171] Adding SpaceBlock functionality

* [VSPC-171] Front-end changes

* [VSPC-171] Added drop down for staff to pick space to link to from space content block

* [VSPC-171] Bug checks

* [VSPC-171] Form fix

* [VSPC-171] Space content block changes on slide.html

* [VSPC-171] Delete and edit related changes for space block

* [VSPC-171] Unit test

* [VSPC-171] dropdown will keep track of selected space block

* [VSPC-171] Code factor changes

* [VSPC-171] PR code review change

* [VSPC-171] Removing loggers

* [VSPC-171] PR Review comments

* [VSPC-171] Review comments

* [VSPC-171] PR Review comments

* [VSPC-171] PR review comments

* [VSPC-171] Whitespace removal

* [VSPC-171] Exhibition side link

* [VSPC-171] PR Review comments addressed

* [VSPC-171] PR review comments

* [VSPC-171] PR comment on log

* [VSPC-171] indentation

* [VSPC-171] Indentation changes

* [VSPC-171] Removing log

* [VSPC-171] implemented ajax call to get list of spaces

* [VSPC-171]  Current selected space in edit space content block

* [VSPC-171] Indentation fix

* [VSPC-171] Space search

* [VSPC-171] pagination and editspaceblock drop down

* [VSPC-171] current selected space for spaceblock

* [VSPC-171] adding headers to csrf

* [VSPC-171] unit test

* [VSPC-171] overloaded space

* [VSPC-171] pr comments

* [VSPC-171] Organize imports

* [VSPC-171] Organized imports

* [VSPC-171] page size call to db fix

* [VSPC-171] fix indentation issues

* [VSPC-171] test cases fix

* [VSPC-171] Addressed review comments

* [VSPC-171] changing token input parameter

* [VSPC-171] worked on PR comment'

* [VSPC-171] added changes to merge the PR

* [VSPC-171] added testcase for id which is not found

* [VSPC-171] added changes for testcase failure

* [VSPC-171] added test cases as mentioned in PR

* [VSPC-171] added test cases

* [VSPC-171] added test cases to increase coverage

* [VSPC-171] added test case to increase the code coverage

* [VSPC-171] addressed review comments

* [VSPC-171] added changes to resolve codefactor.io problems

* [VSPC-171] Addressed review comments

* [VSPC-171] changed method name

* [VSPC-171] testing junits

* [VSPC-171] JUNITS

* [VSPC-171] addressed review comments

* [VSPC-171] addressed review comments

* [VSPC-171] addressed review comments

* [story/VSPC-171] review comments

* [story/VSPC-171] review comments

* [VSPC-171] tooltip

* [VSPC-171] fixed close buttons

* [vspc-171] compile error tests

* [story/VSPC-171] review comments

* VSPC-171 fixed null selection

* VSPC-171 block refreshing error

* VSPC-171 fixed space block deletion

* VSPC-171 removed console prints

* VSPC-171 review comments

* VSPC-171 review comments and image block

* VSPC-171 fixed the image block creation

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 attempt to fix reordering of content blocks

* VSPC-171 build fail fix

* VSPC-171 updated test for updating space block

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 retreving video block

* VSPC-171 fixed missing video block

* VSPC-171 review comments

* VSPC-171 review comments indentation

* [VSPC-171] review comments

* [VSPC-171] review comments

* [VSPC-171] review comments 1

* VSPC-171 fixed indenttions and review comments

* VSPC-171 indentation fix

* [VSPC-171] broken code fixed

* VSPC-171 fixed staff search space controler

* VSPC-171 addressed all review comments

* VSPC-171 review comments

* VSPC-171 review comments for block handlers

* VSPC-171 review comments

* VSPC-171 slide indentation fixing

* VSPC-171 fixed space trash icon alignment

* VSPC-171 slides spacing issue fixed

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 slides space fixed

* VSPC-171 removed unecessary markdown and other review comments

* VSPC-171 codefactor issue fixed

* VSPC-171 fixed minor indentation

* VSPC-171 review comments

* VSPC-171 spaces display in the lists

* VSPC-171 added spaces to the list

* VSPC-171 review comments

* VSPC-171 fixing space display in options

* VSPC-171 review comments

* VSPC-171 added space name search

* VSPC-171 fixed null display of spaces

* VSPC-171 final fixes

* VSPC-171 review comments

* VSPC-171 csrf comments

* VSPC-171 misc

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 minor changes

* VSPC-171 space check

* VSPC-171 revert check because the line is shown on the review side but not in the branch

* VSPC-171 github indentation fixed

* VSPC-171 review comments about indentation

* [VSPC-171] fixed issues with deleting space block and previous selected space

* VSPC-171 review comments minor change

* VSPC-171 review comments minor change check

* VSPC-171 review comments minor change check

* VSPC-147 set selected space to the dropdown

* [VSPC-171] fixed display of selected space

* VSPC-171 null result error fixed

* VSPC-171 testing for deployment

* [VSPC-171] slide not showing up error:

* VSPC-171 review comments

* VSPC-171 search space by id controller

* VSPC-171 review comments

---------

Co-authored-by: Baishali Nayak <bnayak4@asu.edu>
Co-authored-by: pkharge <pkharge@asu.edu>
Co-authored-by: ajay3568yadav <89062459+ajay3568yadav@users.noreply.github.com>
Co-authored-by: ajay Yadav <ajayyadav@ajays-MacBook-Air-2.local>
@pooja-thalur @bnayak4 @tusanand
Story/vspc 208 (#341)
d7f55ea 
* [VSPC-208] added UI changes to include space link, module link and external link image

* [VSPC-208] connected backend to frontend

* [VSPC-208] code changes to remove csrf token error

* [VSPC-208] added changes for bean class

* [VSPC-208] tried creating new form to remove the error

* [VSPC-208] added the controller and did cosmetic UI changes

* [VSPC-208] added controller changes

* [VSPC-208] used Apache Tika to extract data from the images and store it

* [VSPC-208] refactored the code

* [VSPC-208] added changes to save the spaceLinkImage

* [VSPC-208] added changes to save images with spaceId

* [VSPC-208] deleted defaultImageRepository

* [VSPC-208] link changes started

* [VSPC-208] need to set the bgImage fields

* [VSPC-208] added changes for the image resize

* [VSPC-208] image extraction when image not uploaded

* [VSPC-208] added changes to make the arrow field visible in the front end

* [VSPC-208] added changed to print the image in the frontEnd

* [VSPC-208] added changes after testing the staff side

* [VSPC-208] Added changes to remove the images

* [VSPC-208] getting images in the front end side

* [VSPC-208] hibernate exception removed

* [VSPC-208] getting hibernate error

* [VSPC-208] added changes

* [VSPC-208] removed and changed the code to include it for all the exhibition

* [VSPC-208] added changes

* [VSPC-208] added changes

* [VSPC-208] adding changes

* [VSPC-208] added changes to show imageLink in the UI

* [VSPC-208] added changes

* [VSPC-208] added changes

* [VSPC-208] added changes

* [VSPC-208] added changes to VSPC-208

* [VSPC-208] added changes to set flag if there is default imag eor not

* [VSPC-208] added changes to modify the exhibition image

* [VSPC-208] added changes to default images story

* [VSPC-208] controller for each space Links

* [VSPC-208] added flag

* [VSPC-208] added controller to check image

* [vspc-208] added link image changes

* [VSPC-208] added minor changes and junits

* [VSPC-208] added JUNITS

* [VSPC-208] removed merge conflict

* [VSPC-208] removed indentation issue

* [VSPC-208] removed indentation issue

* [VSPC-208] removed indentation issue

* [VSPC-208] removed indentation issue

* [VSPC-208] removed indentation issue

* [VSPC-208] addressed review comments

* [VSPC-208] added review comments changes

* [VSPC-208] added changes to incorporate PR Review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comment

* [VSPC-208] addressed review comments

* [VSPC-208] refactored code

* [VSPC-208] Updated image display and debugged code fault to make it mandaory to select image when selecting link type as Image

* [VSPC-208] Updated code to display proper default image with text on hover

* [VSPC-208] Updated code to display default images on exhibition page

* addressed code review comments

* refactored code as per code review comments

* addressed pr comments, fixed indentation issues

* fixed indentation issues

* fixed some more identation issues

* addressed pr comments

* addresed pr comments

* refactored code

* codefactor issue

* Refactored code according to pr comments

* addressed pr comments

* removed unnecessary spaces

* Fixed indentation issues

* removed unnecessary changes

* reverting the unnecessary file changes to develop version

* reverted the file changes to develop version

* reverting file changes to develop version

* reverting to develop version

* removed extra spaces

* Removed unrelated changes

* Removed unrelated file changes

* fixed indentation issue

* Addressed pr comments

* VSPC-208 resolved pr comment

* [VSPC-208] addressed few pr comments

* [VSPC-208] separated the default space link image from general configuration

* [VSPC-208] Code cleanup and addressed pr comments

* [VSPC-208] indentation fix

* [VSPC-208] indentation fix

* [VSPC-208] Fixed indentation

* [VSPC-208] addressed pr comments

* [VSPC-208] addressed pr comments

* [VSPC-208] javadoc changes

* [VSPC-208] addressed pr comments

* [VSPC-208] addressed pr comments

* [VSPC-208] addressed pr comments

* [VSPC-208] code factor

* [VSPC-208] code factor

* [VSPC-208] code cleanup

* [VSPC-208] resolved test cases failure

* [VSPC-208] addressed pr comment

* [VSPC-208] addressed pr comments

* [VSPC-208] addressed pr comments

* [VSPC-208] mapped link type to its method

* [VSPC-208] addressed pr comments

* [VSPC-208] addressed review comments

* [VSPC-208] addressed review comment

* [VSPC-208] review comments addressed

* [VSPC-208] extra line removed

* [VSPC-208] review comments addressed

* [VSPC-208] review comments addressed

* [VSPC-208] removed import

---------

Co-authored-by: Baishali Nayak <bnayak4@asu.edu>
Co-authored-by: Tushar Anand <tanand7@asu.edu>
@pooja-thalur
Bug/vspc 271 - Exhibition Configuration: if not exhibition language s…
07dac07 
…hould be required (#348)

* [VSPC-271] creating exhibition object when no exhibition is found

* Revert "[VSPC-271] creating exhibition object when no exhibition is found"

This reverts commit 552a29c.

* [VSPC-271] added a help icon in exhibition languages field

* [VSPC-271] Fixed indentation

* [VSPC-271] fixed indentation

* [VSPC-271] added validation

* [VSPC-271] adding a class for the form params

* [VSPC-271] added form validation

* [VSPC-271] form validation changes

* [VSPC-271] organised methods

* [VSPC-271] addressed pr comments

* [VSPC-271] addressed pr comment

* [VSPC-271] addressed pr comments

* [VSPC-271] repeated tooltip removed

* [VSPC-271] review comments addressed
@ajay3568yadav @glendsouza1702
@bnayak4 @pkharge
story/VSPC-217 (#351)
223572a 
* [VSPC-171] Added new SpaceBlock

* [VSPC-171] Added SpaceBlock type functionality

* [VSPC-171] Adding SpaceBlock functionality

* [VSPC-171] Front-end changes

* [VSPC-171] Added drop down for staff to pick space to link to from space content block

* [VSPC-171] Bug checks

* [VSPC-171] Form fix

* [VSPC-171] Space content block changes on slide.html

* [VSPC-171] Delete and edit related changes for space block

* [VSPC-171] Unit test

* [VSPC-171] dropdown will keep track of selected space block

* [VSPC-171] Code factor changes

* [VSPC-171] PR code review change

* [VSPC-171] Removing loggers

* [VSPC-171] PR Review comments

* [VSPC-171] Review comments

* [VSPC-171] PR Review comments

* [VSPC-171] PR review comments

* [VSPC-171] Whitespace removal

* [VSPC-171] Exhibition side link

* [VSPC-171] PR Review comments addressed

* [VSPC-171] PR review comments

* [VSPC-171] PR comment on log

* [VSPC-171] indentation

* [VSPC-171] Indentation changes

* [VSPC-171] Removing log

* [VSPC-171] implemented ajax call to get list of spaces

* [VSPC-171]  Current selected space in edit space content block

* [VSPC-171] Indentation fix

* [VSPC-171] Space search

* [VSPC-171] pagination and editspaceblock drop down

* [VSPC-171] current selected space for spaceblock

* [VSPC-171] adding headers to csrf

* [VSPC-171] unit test

* [VSPC-171] overloaded space

* [VSPC-171] pr comments

* [VSPC-171] Organize imports

* [VSPC-171] Organized imports

* [VSPC-171] page size call to db fix

* [VSPC-171] fix indentation issues

* [VSPC-171] test cases fix

* [VSPC-171] Addressed review comments

* [VSPC-171] changing token input parameter

* [VSPC-171] worked on PR comment'

* [VSPC-171] added changes to merge the PR

* [VSPC-171] added testcase for id which is not found

* [VSPC-171] added changes for testcase failure

* [VSPC-171] added test cases as mentioned in PR

* [VSPC-171] added test cases

* [VSPC-171] added test cases to increase coverage

* [VSPC-171] added test case to increase the code coverage

* [VSPC-171] addressed review comments

* [VSPC-171] added changes to resolve codefactor.io problems

* [VSPC-171] Addressed review comments

* [VSPC-171] changed method name

* [VSPC-171] testing junits

* [VSPC-171] JUNITS

* [VSPC-171] addressed review comments

* [VSPC-171] addressed review comments

* [VSPC-171] addressed review comments

* [story/VSPC-171] review comments

* [story/VSPC-171] review comments

* [VSPC-171] tooltip

* [VSPC-171] fixed close buttons

* [vspc-171] compile error tests

* [story/VSPC-171] review comments

* VSPC-171 fixed null selection

* VSPC-171 block refreshing error

* VSPC-171 fixed space block deletion

* VSPC-171 removed console prints

* VSPC-171 review comments

* VSPC-171 review comments and image block

* VSPC-171 fixed the image block creation

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 attempt to fix reordering of content blocks

* VSPC-171 build fail fix

* VSPC-171 updated test for updating space block

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 retreving video block

* VSPC-171 fixed missing video block

* VSPC-171 review comments

* VSPC-171 review comments indentation

* [VSPC-171] review comments

* [VSPC-171] review comments

* [VSPC-171] review comments 1

* VSPC-171 fixed indenttions and review comments

* VSPC-171 indentation fix

* [VSPC-171] broken code fixed

* VSPC-171 fixed staff search space controler

* VSPC-171 addressed all review comments

* VSPC-171 review comments

* VSPC-171 review comments for block handlers

* VSPC-171 review comments

* VSPC-171 slide indentation fixing

* VSPC-171 fixed space trash icon alignment

* VSPC-171 slides spacing issue fixed

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 slides space fixed

* VSPC-171 removed unecessary markdown and other review comments

* VSPC-171 codefactor issue fixed

* VSPC-171 fixed minor indentation

* VSPC-171 review comments

* VSPC-171 spaces display in the lists

* VSPC-171 added spaces to the list

* VSPC-171 review comments

* VSPC-171 fixing space display in options

* VSPC-171 review comments

* VSPC-171 added space name search

* VSPC-171 fixed null display of spaces

* VSPC-171 final fixes

* VSPC-171 review comments

* VSPC-171 csrf comments

* VSPC-171 misc

* VSPC-171 review comments

* VSPC-171 review comments

* VSPC-171 minor changes

* VSPC-171 space check

* VSPC-171 revert check because the line is shown on the review side but not in the branch

* VSPC-171 github indentation fixed

* VSPC-171 review comments about indentation

* [VSPC-171] fixed issues with deleting space block and previous selected space

* VSPC-171 review comments minor change

* VSPC-171 review comments minor change check

* VSPC-171 review comments minor change check

* VSPC-147 set selected space to the dropdown

* [VSPC-171] fixed display of selected space

* VSPC-217 pagination

* VSPC-217 pagination

* VSPC-217 pagination

* VSPC-217 Fixed pagination, now need to fix the correct display

* VSPC-217 space display

* VSPC-217 fixed

* VSPC-217 fixed infinte scrolling

* VSPC-217 codefactor issue resolved

* VSPC-217 review comments

* VSPC-217 created spacesearch controller api

* VSPC-217 api fixed

* VSPC-217 api fix attempt for review comment

* VSPC-217 review comments

* VSPC-217 removed unused function

* VSPC-217 review comments

* VSPC-217 review comments on space search

* VSPC review comments json

---------

Co-authored-by: glend17 <glendsouza1702@gmail.com>
Co-authored-by: Baishali Nayak <bnayak4@asu.edu>
Co-authored-by: pkharge <pkharge@asu.edu>
Co-authored-by: ajay Yadav <ajayyadav@ajays-air.dhcp.asu.edu>
Co-authored-by: ajay Yadav <ajayyadav@ajays-MacBook-Air-2.local>
Co-authored-by: ajay Yadav <ajayyadav@Mac.attlocal.net>
Co-authored-by: ajay Yadav <ajayyadav@mac.dhcp.asu.edu>
@jophals
[develop] fixed exhibitionLanguages.properties file encoding error!
344e2b9
@jophals
Merge branch 'develop' of https://github.com/diging/virtual-spaces-2.0 …
d4c84ae 
…into develop
@jophals
[develop] second try to fix exhibitionLanguages file encoding error!
67bcddb
@pradeep-017 @ajay3568yadav
Story/vspc 147 (#228)
744c7e3 
* [VSPC-147] Intial changes and new files created for Bibliography block in slides

* [VSOC-147] Edit Bibliography controller created and using it in slide page - Work in progress

* [VSPC-147] code cleaning for slide.html

* [VSPC-147] Delete functionality for bibliography and button alignment on slide page + Code cleanup

* [VSPC-147] Code indentation changes for slide.html

* [VSPC-147] Code indentation fix for slide.html

* [VSPC-147] Adding more fields for bibliography - Work in progress

* [VSPC-147] Added new fields and worked on CRUD opeerations to work on them, fixed code indentations and div alignments

* [VSPC-147] Tests for bibliography feature on slides-Work in progress

* [VSPC-147] Test cases for Bibliography

* [VSPC-147] csrf token passing via headers enabled for ajax calls and code cleanup

* [VSPC-147] Image icon changed for bibliography and bibliographies now shown on public page

* [VSPC-147] Corrected id tags for slide contents on public page, Bibliography not detected by zotero extension

* [VSPC-147] Changes for bibliography citations and making Zotero detect it

* [VSPC-147] Changes for bibliography metadata view on public page for detection by zotero - work in progress

* [VSPC-147] Detection of Bibliographies by Zotero - General functionality completed

* [VSPC-147] Code changes for returning json afetr creation of Bibliography, handling null cases of path variables, code cleanup

* [VSPC-147] Json response checks and handling for bibliography creation

* [VSPC-147] Updated biblio exception class for code factor error check

* [VSPC-147] Exposing Biblipgraphy metadata to be picked up by zotero

* [VSPC-147] Exposing bibliography metadata to be picked by zotero - Strategy Design pattern

* [VSPC-147] Intriducing Reference class under Bibliography and related changes

* [VSPC-147] Added Reference factory, manager, controller classes. Changed Biblio controller and forms - Saving is working - Work in Progress

* [VSPC-147] changes for CRUD on bibliography block and references

* [VSPC-147] AddReference controller and bringing references under biblio block

* [VSPC-147] Add and Edit Reference completed, Created Exception class

* [VSPC-147] Completed Delete operation on References and corrected few things for Edit Reference as well

* [VSPC-147] Delete Bibliographies handled by taking care of deleteing References under it, fixes for edit reference and edit biblio

* [VSPC-147] Completed changes for showing bibliographies and references over public page and few fixes for clearing inputs after save

* [VSPC-147] CHanges for writing tests (in progress) and working review comments

* [VSPC-147] Changes for making BiblioBlock and References indepedent and handling the CRUD

* [VSPC-147] Completed changes for Bibliography and reference blocks on slide page and made it available for public site as well

* VSPC-147 Spacing Loading error fixed

* VSPC-147 fixed biblio block display

* VSPC-147 bibliography block

* VSPC-147 biblio block fixed

* VSPC-147 Fixed, Biblio and reference blocks

* VSPC-147 fixed biblio and text block alignment issue

* VSPC-147 fixed formatting for review

* VSPC-147 review comments

* VSPC-147 codefactor issue fixed and review comments

* VSPC-147 review comment

* VSPC-147 codefactor warning fix

* VSPC-147 review comments

* VSPC-147 review comments

* [VSPC-147] review comments about 404 not found

* [VSPC-147] review comments

* [VSPC-147] review comments fix

* VSPC-147 added 404 not found

* VSPC-147 fixed bibiliblock miss references

* VSPC-147 404

* VSPC-147 bibiliblock 404

* VSPC-147 review comments

* VSPC-147 fixed broken code

* VSPC-147 review comments

* VSPC-147 review comments 404

* VSPC-147 re-formatting

* VSPC-147 indentation fix

* VSPC-147 rev iew comments

* VSPC-147 indentation 2

* VSPC-147 indentation fix

* VSPC-147 indentation

* VSPC-147 indent fix

* VSPC-171 removed extra document ready function

* VSPC-171 buttons indentation fixed

* VSPC-147 merge conflicts fix

* VSPC-147 review comment on logger

* VSPC-147 bibliography review comments

* VSPC-147 review comments on biblioblock method name and logger

* VSCP-147 test build fail test1

* VSCP-147 revert

* VSPC-147 test 2

* VSPC-147 contentblock manager title descrioption fixed

* VSPC-147 test

* VSPC-147 added ArgumentCaptor

* VSPC-147 test 3

* VSPC-147 reference manager test

* VSCP-147 test 4

* VSPC-147 test 5

* VSPC-147 logger comment

* [VSPC-147] trying to fix the review side code not updated

* [VSPC-147] recommitting previous to fix

* Review comments pom.xml DateOffset exception

* VSPC-147 ref block debug

* VSPC-147 debug attempt

* VSPC-147 reference block edit fix attempt

* VSPC-147 reference showing up again

* VSPC-147 removed console log statmenets

* VSPC-147 finished ref block

* VSPC-147 cleaned controller checkstatements

* VSPC-147 review comments

* VSPC-147 review comments on types

* VSPC-147 bibliogrphy review comments

* VSPC-147 review comments

* VSPC_147 review comments on html rendering

* VSPC-147 review comments

* VSPC-147 review comments and content order fix

* VSPC-147 content order issue addressing

* VSPC-147 fixed contentOrder

* VSPC-147 review comments

* VSPC-147 review comments on parsing using Spring

* VSPC-147 review comments addressed

* VSPC-147 delete reference ID changed

* VSPC-147 delete reference issue fixed

* VSPC-147 review comments

* VSPC-147 js cleanup attempt

* VSPC-147 JS cleanup attempt

* VSPC-147 JS clean up

* VSPC-147 JS cleanup

* VSPC-147 data-id

* VSPC-147 delete reference error

* VSPC-147 java script clean up

* VSPC-147 code refactor

* VSPC-147 clean up

* VSPC-147 refactored code

* VSPC-147 refactoring space html

* VSPC-147 JS Cleanup complete

* VSPC-147 fixed references

* VSPC-147 edited video and image blocks

* VSPC-147 fixed edit biblio block cancel

* VSPC-147 fixed edit textblock cancel

* VSPC-147 edit reference cancel

* VSPC-147 biblio cancel edit rendering fixed

* VSPC-147 fixed edit reference fields

* VSPC-147 fixed css display for rendering

* VSPC-147 merge conflict

* VSPC-147 review comments

* VSPC-147 review comments on reference block

* VSPC-147 review comments on field order

* VSPC-147 field order indent fix

* VSPC-147 code factor issue resolved

* VSPCS-147 reference block edit type field not retaining the type

---------

Co-authored-by: ajay3568yadav <89062459+ajay3568yadav@users.noreply.github.com>
Co-authored-by: ajay Yadav <ajayyadav@ajays-MacBook-Air-2.local>
Co-authored-by: ajay Yadav <ajayyadav@Mac.attlocal.net>
Co-authored-by: ajay3568yadav <ajay3568@gmail.com>
@dependabot
Bump commons-io:commons-io from 2.7 to 2.14.0 in /vspace (#350)
1496f04 
Bumps commons-io:commons-io from 2.7 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jdamerow jdamerow merged commit f3386ac into master Jun 18, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@jdamerow @pkharge @bnayak4 @swetalina-prusty25 @glendsouza1702 @pooja-thalur @ajay3568yadav @jophals @pradeep-017