Skip to content

Commit

Permalink
Merge pull request #149 from iodepo/revert-148-feature/restyling
Browse files Browse the repository at this point in the history
Revert "merge branch Feature/restyling into main"
  • Loading branch information
jmckenna authored Dec 17, 2024
2 parents beb73c5 + fca14ed commit bd6eed9
Show file tree
Hide file tree
Showing 147 changed files with 20,147 additions and 564,338 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/check-crlf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout repository contents
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use action to check for CRLF endings
uses: erclu/[email protected]
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/irc_notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: irc push
uses: rectalogic/notify-irc@v1
uses: rectalogic/notify-irc@v2
if: github.event_name == 'push'
with:
channel: "#oih"
Expand All @@ -26,7 +26,7 @@ jobs:
${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }}
${{ join(github.event.commits.*.message) }}
- name: irc pull request
uses: rectalogic/notify-irc@v1
uses: rectalogic/notify-irc@v2
if: github.event_name == 'pull_request'
with:
channel: "#oih"
Expand All @@ -35,8 +35,9 @@ jobs:
notice: true
message: |
${{ github.actor }} opened PR ${{ github.event.pull_request.html_url }}
${{ github.event.pull_request.title }}
- name: irc tag created
uses: rectalogic/notify-irc@v1
uses: rectalogic/notify-irc@v2
if: github.event_name == 'create' && github.event.ref_type == 'tag'
with:
channel: "#oih"
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
venv/
__pycache__

solr/sample-solr-data
package-lock.json

solrlog.txt
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2023 Ocean InfoHub
Copyright (c) 2024 Ocean InfoHub

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ This repo contains the code for the Ocean Info Hub Global Search Portal.
* `/indexer` contains all of the code to ingest the OIH graph into the SOLR Instance
* `/solr` contains the configuration required for the solr instance, including the schema.
* `/frontend` contains the code for the static javascript app. This will produce a container in dev mode running a live server, and a static html/javascript site in production mode.
* `/regions` contains the QGIS file defining the gographical regions.
* `/regions` contains the QGIS file defining the geographical regions.

See the individual README files for more information.
39 changes: 0 additions & 39 deletions api/api/config.json

This file was deleted.

Loading

0 comments on commit bd6eed9

Please sign in to comment.