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

Zebra update #98

Merged
merged 28 commits into from
Apr 8, 2021
Merged

Zebra update #98

merged 28 commits into from
Apr 8, 2021

Conversation

Atticus29
Copy link
Contributor

No description provided.

Atticus29 and others added 28 commits February 11, 2021 16:58
@Atticus29
WB-652 sanitize special characters from file name before storing it s…
86ff813 
…erverside
@Atticus29
WB-652 sanitize special characters from file name before storing it s…
79a8763 
…erverside for additional media assets in encounter and from bulk import
@Atticus29
WB-652 sanitize special characters from file name before storing it s…
126e5d9 
…erverside for additional media assets in encounter and from bulk import
@Atticus29
Merge branch 'master' of https://github.com/WildMeOrg/Wildbook
b2e5337
@colinwkingen
WB-1519 replace reserved pound sign in project filtering URLs
567ca5a
@colinwkingen
WB-1526 add locationID to parent task for encounter.jsp additional media
8210848
@holmbergius
WB-1489 continued
1701b98
@Atticus29
Merge branch 'master' of https://github.com/WildMeOrg/Wildbook
6fc44cb
@Atticus29
take WB-652 commit out of master before it gets approved whoops
b0ad0f0
@Atticus29
WB-1497 no more missing acmids for master
7835895
@holmbergius
Merge pull request #85 from WildMeOrg/missing-acmid-fix
8ceaba7 
Missing acmid fix
@Atticus29
WB-1497 minor fix per JH suggestion
b3821d6
@Atticus29
a non conflict conflict
13b2dc0
@Atticus29
WB-652 unsanitize numbers and confirm that WB-1497 fixes restore IA
9169b15
@Atticus29
resolve merge conflicts with master
1be8e3b
@Atticus29
remove print statements
8327129
@holmbergius
Merge pull request #86 from WildMeOrg/kosher-media-asset-filenames
ca18837 
Kosher media asset filenames
@holmbergius
WB-1545: admins can edit individual names
833a8fe
@Atticus29
remove google search and map templates from commonConfig
cbfff62
@holmbergius @colinwkingen
WB-1440 idea
56ea5ba
@colinwkingen
remove unneeded file
e6ca495
@Atticus29
add cherry-picked code from WB-1196
325cbcd
@Atticus29
cherry pick WB-652 fixes
2538426
@holmbergius
WB-1569: remove duplication
19a2a66
@colinwkingen
WB-1549 Redux: ensure enc detached from project on import delete
111f454
@colinwkingen
WB-652 fix for WB-1538, strip URL param special chars for bulk import
2793aba
@Atticus29
resolve merge conflicts w master
9ec3207
@Atticus29
WB-1459 prevents display of disambiguator when only one feature in as…
8073aa8 
…set, add sandbox.jsp for posterity, change editAssetStore
@Atticus29 Atticus29 merged commit 6d5e589 into zebra Apr 8, 2021
@Atticus29 Atticus29 deleted the zebra-update branch April 8, 2021 21:28
drewblount
drewblount reviewed Apr 9, 2021
View reviewed changes
Copy link
Contributor

@drewblount drewblount left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line 44 in editAssetStore.jsp should use a reflexive method to see current server url (ServletUtilities? there should be examples somewhere...) rather than hard coding the server url. That way it won't need changing for each branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drewblount drewblount drewblount left review comments

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
@Atticus29 @holmbergius @drewblount @colinwkingen