-
Notifications
You must be signed in to change notification settings - Fork 36
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
Add Specify 6.8.03 Static Files to Specify 7 #5266
Merged
Merged
Changes from 30 commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
075f0dd
add Specify6.8.03 config file to Specify7
acwhite211 364d82f
change THICK_CLIENT_LOCATION in settings
acwhite211 249894d
filter out unused files in Specify 7
acwhite211 b85a3b8
config nginx.conf and docker-compose.yml for new config location
acwhite211 db71e30
more config files to filter out
acwhite211 8f4fca3
init common geo forms
acwhite211 c456c29
Remove invalid compose project `specify6`
grantfitzsimmons 43a518d
Remove JRXML files
grantfitzsimmons 9b73b01
Merge branch 'issue-4828' of https://github.com/specify/specify7 into…
grantfitzsimmons 217f6de
add specify 6.8.03 jar to config
acwhite211 2bb01e3
use bind mount instead of named volume for config
acwhite211 62d01d1
DEFAULT_SPECIFY_JAR_PATH
acwhite211 5f8b600
remove unused accessions files
acwhite211 799430e
add back specify_datamodel.xml
acwhite211 c6fed09
remove specify jar dependency
acwhite211 4784aa9
add all specify.jar items into directory
acwhite211 0accbad
Revert "add all specify.jar items into directory"
acwhite211 36b3cca
Revert "remove specify jar dependency"
acwhite211 f5c472f
let GitHub search for specify.jar 🤷
acwhite211 bf27c6e
wat
acwhite211 96d10ce
create geology.views.xml
acwhite211 73ba508
Update geology.views.xml
grantfitzsimmons afe9684
Update geology.views.xml
grantfitzsimmons 8534551
Update geology.views.xml
grantfitzsimmons d64f31b
Add COGs to Common Views, migrate Geology views
grantfitzsimmons 66b24d6
Add Geology viewset registry
melton-jason 6bda868
Merge branch 'production' into issue-4828
grantfitzsimmons 489d70f
Add geology discipline to Specify 7 list of disciplines
melton-jason acfe52e
Remove unused Specify 7 files
melton-jason ad9871f
Remove unused/deleted views and appresources from registries
melton-jason 4188f95
Improve COJO form and add COG subform
grantfitzsimmons 3f23633
Update docker-compose.yml
acwhite211 d310c01
Revert default THICK_CLIENT_LOCATION
acwhite211 d40cde9
Add Absolute Age & Relative Age forms
grantfitzsimmons 4b0ca10
edit DEFAULT_SPECIFY_JAR_PATH
acwhite211 37a6a94
COPY config location in Dockerfile
acwhite211 b3b63f0
new find_jar
acwhite211 6610588
config symlink
acwhite211 0cd53f3
dockerfile bug fix
acwhite211 40de4b4
copy specify-config into static-files volume
acwhite211 f2349cb
remove unused lines
acwhite211 71b3573
Merge branch 'production' into issue-4828
acwhite211 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <files> | ||
| <file level="0" mimetype="text/xml" name="UIFormatters" description="UIFormatters" file="uiformatters.xml"/> | ||
| <file level="0" mimetype="text/xml" name="DataObjFormatters" description="DataObjFormatters" file="dataobj_formatters.xml"/> | ||
| <file level="0" mimetype="text/xml" name="TypeSearches" description="TypeSearches" file="typesearch_def.xml"/> | ||
| </files> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
while this file is used at the moment, could we refactor back-end to not use app_resources.xml files?
e.g aren't all UIFormatters XML files of the same name, thus removing the need for this file?
it seems that this file is used at present to tell specify what files are defined in a given folder - wouldn't it be better to simply check if the file is present on the file system?