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.

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

Merge 4.2 from dev into master #808

Merged
merged 82 commits into from
Dec 5, 2023
Merged

Merge 4.2 from dev into master #808

merged 82 commits into from
Dec 5, 2023

Conversation

jack-brinkman
Copy link

No description provided.

mracer0102 and others added 30 commits August 18, 2023 15:46
@mracer0102
Base on displayOption, find all images with Excluded or Included from…
f1df094 
… profile.imageSetting

and make minusQuery and change startIndex, count, availeImageCount.
@mracer0102
delete useless codes
76ca04e
@schoicsiro
Merge pull request #775 from AtlasOfLivingAustralia/feature/fathom
69b4660 
Adding fathom analytics
@schoicsiro
#691-Main image problem when profile contains private image
1776848
@schoicsiro
remove comments codes and put comments for logic
8c1e83e
@schoicsiro
remove comments code and change variable name
79e56b9
@schoicsiro
change test case and add staged image case
e68b6d1
@schoicsiro
change the condition for readonly view
2c40f35
@schoicsiro
Remove stagedImage case
e6ef8d8
@schoicsiro
Change logic for filter private images based on readonly or edit and …
8022de8 
…fix test case as AuthService
@schoicsiro
add new branch
49ee047
@schoicsiro
Merge pull request #779 from AtlasOfLivingAustralia/#745-Problem-sele…
e6a5ebc 
…cting-and-displaying-multiple-images-when-there-are-private-images

#745 problem selecting and displaying multiple images when there are private images
@schoicsiro
#777 Add API to list collections
9cb4074
@schoicsiro
#777 remove comment
734f254
@schoicsiro
#777 change logic and use existing Opus
7109714
@schoicsiro
#777 add pojo
9f28e22
@schoicsiro
#777 add @GrantAccess and logic for grant access
d6e3c9d
@temi
Merge branch 'master' into dev
0d7fe87
@temi
4.2-SNAPSHOT
056631b
@schoicsiro
#647 Move the "Delete Collection" button
552564c
@schoicsiro
#647 add help text
8342719
@schoicsiro
#647 check if user is alaAdmin
cf26e1c
@schoicsiro
#647 revert
6cbb2be
@schoicsiro
Merge pull request #784 from AtlasOfLivingAustralia/feature/#647
9e5f5a6 
Feature/#647
@schoicsiro
Placeholder - Editing user roles comes back with error " User already…
dc9cc21 
… exiss"
@schoicsiro
#700 change codes for removing disabled button
3332259
@schoicsiro
#700 fix javascript fail during build
555d64b
@schoicsiro
#658 Error when saving comments
f3fb553
@schoicsiro
#658 Error when saving comments
3d334b2
@schoicsiro
#785 Add APIs to access images
ac05c49
schoicsiro and others added 29 commits October 11, 2023 16:31
@schoicsiro
#728 add send error and HttpStatus
818b019
@schoicsiro
Feature/#781 (#782)
0103d97 
* #781 remove PDF export
@schoicsiro
#657 Error when deleting comments on first go, ok after that
ace1bb7
@schoicsiro
#657 changed logic
65c49c6
@schoicsiro
#657 fix test cases
9a30cc0
@schoicsiro
#728 code changes and fix test case
906a680
@schoicsiro
#728 code changes and fix test case
53bfa1f
@schoicsiro
Merge pull request #791 from AtlasOfLivingAustralia/Feature/#728
b9034fb 
Feature/#728
@temi
Merge pull request #794 from AtlasOfLivingAustralia/feature/#657
76b9496 
Feature/#657
@temi
Merge pull request #780 from AtlasOfLivingAustralia/Feature-#691
dd6a660 
Feature #691
@schoicsiro
#735 "My Profile" menu item displays error (page not found)
93cec14
@schoicsiro
#797 upgrade ALA security plugin
551697c
@temi
Merge pull request #795 from AtlasOfLivingAustralia/feature/#735
9516586 
#735 "My Profile" menu item displays error (page not found)
@schoicsiro
#800 Add new categories to attachments
c3c6319
@schoicsiro
#800 add test case
01475b0
@schoicsiro
#800 change value name
796356c
@temi
Merge pull request #801 from AtlasOfLivingAustralia/feature/#800
a24aae9 
Feature/#800
@schoicsiro
#800 replace imageId to fileName
114dee4
@schoicsiro
#785_2 fix
415134c
@temi
Merge pull request #803 from AtlasOfLivingAustralia/feature/#785_2
2cefd40 
#785_2 replace imageId to fileName
@schoicsiro
#785_3 fix content-type
c659f1c
@schoicsiro
Merge pull request #804 from AtlasOfLivingAustralia/feature/#785_3
80c2d13 
#785_3 fix content-type
@temi
Merge pull request #799 from AtlasOfLivingAustralia/feature/#797
e1efba6 
#797 upgrade ALA security plugin
@temi
version update 4.2-SNAPSHOT
5a99814
@temi
- updated api docs
136a451
@schoicsiro
#781 fix to publication is not showing in edit mode
4007608
@temi
Merge pull request #806 from AtlasOfLivingAustralia/feature/#781_2
580ae4c 
#781 fix to publication is not showing in edit mode
@schoicsiro
#800_1 : fix category option issue
a5bf33d
@temi
Merge pull request #807 from AtlasOfLivingAustralia/feature/#800_1
6427066 
#800_1 : fix category option issue
@jack-brinkman jack-brinkman merged commit 59637cb into master Dec 5, 2023
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.
4 participants
@jack-brinkman @mracer0102 @schoicsiro @temi