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.

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

merging dataquest-dev/dtq-dev #18

Merged
merged 35 commits into from
Dec 4, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2214559
UFAL/Share submission with user not only admin (#728)
milanmajchrak Nov 12, 2024
057632d
Updated messages following last commit to upstream. (#731)
milanmajchrak Nov 14, 2024
aa6e71b
Updated dspace prefix to lindat (#734)
milanmajchrak Nov 15, 2024
d506074
Added notification when the shibboleth authentication is failed (#732)
milanmajchrak Nov 19, 2024
5e21da0
Removed two IT: (#737)
milanmajchrak Nov 20, 2024
753594d
Update all static licenses (#726)
Paurikova2 Nov 20, 2024
f9f6e62
Use NAMESPACES from the .env (#727)
milanmajchrak Nov 20, 2024
a6310f0
Update deploy.yml to increase timeout (#738)
milanmajchrak Nov 21, 2024
a2a3e53
Use only 4000, not the {UI_PORT} from the .env because in the contain…
milanmajchrak Nov 21, 2024
09e1167
Update docker-compose-rest.yml
milanmajchrak Nov 21, 2024
c5bc34b
Update docker-compose-rest.yml
milanmajchrak Nov 21, 2024
8d68def
Use only / and /server namespaces, not the values from the .env becau…
milanmajchrak Nov 21, 2024
4e108e6
Expose tomcat `/server` on `/repository/server`
milanmajchrak Nov 21, 2024
5843e54
Take a customized docker-compose-rest.yml which exposes the server on…
milanmajchrak Nov 21, 2024
e7e8185
Updated a path to take right docker-compose files
milanmajchrak Nov 21, 2024
3d052e6
Undo using only default namespaced `/` and `/server`
milanmajchrak Nov 21, 2024
dced963
Merge remote-tracking branch 'dataquest/dtq-dev' into HEAD
kosarko Nov 21, 2024
56f0730
Use custom `docker-compose.yml` from the testing server
milanmajchrak Nov 22, 2024
01b4a93
UFAL/Shibboleth fixed wrong redirect after login with verification to…
milanmajchrak Nov 22, 2024
ea056b2
Use path `./assets` instead of `/assets` (#742)
milanmajchrak Nov 22, 2024
6e281ba
new download instruction for cmd using zip from backend (#739)
Paurikova2 Nov 26, 2024
c335482
Get UI base URL from BE (#744)
milanmajchrak Nov 26, 2024
b782d78
Check that the custom type bind field in configured in the `submissio…
milanmajchrak Nov 28, 2024
42040a6
Searching by type is changed to 'type' instead of 'itemtype' because …
milanmajchrak Nov 29, 2024
6ffc7e5
Use `autoLogin` method (#747)
milanmajchrak Nov 29, 2024
e7e1577
UFAL/Matomo statistics using angulartics2 (#748)
milanmajchrak Nov 29, 2024
0d69bcc
Update db-import action
milanmajchrak Nov 30, 2024
8126cb7
Update import-db action - use main branch
milanmajchrak Nov 30, 2024
374c062
Added a translation for the searching filter `subjectFirstValue` (red…
milanmajchrak Dec 2, 2024
60e2983
Ensure the redirect URL starts with a slash (#753)
milanmajchrak Dec 2, 2024
fc70fcb
Added volume into docker-compose (#754)
milanmajchrak Dec 3, 2024
4c2e997
UFAL/Load the matomo configuration from the environment (#755)
milanmajchrak Dec 3, 2024
e4dcb89
Fetch the matomo properties from the config, not from the environment…
milanmajchrak Dec 3, 2024
1cc31c6
Load the szn license in oninit method (#757)
milanmajchrak Dec 4, 2024
7dc1ec8
Merge remote-tracking branch 'dataquest/dtq-dev' into HEAD
kosarko Dec 4, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use path ./assets instead of /assets (DSpace#742)
milanmajchrak authored Nov 22, 2024
commit ea056b26f1605fdc5d540500cdb061ab594679fb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ const allowedPreviewFormats = ['text/plain', 'text/html', 'application/zip', 'ap
styleUrls: ['./file-description.component.scss'],
})
export class FileDescriptionComponent {
MIME_TYPE_IMAGES_PATH = '/assets/images/mime/';
MIME_TYPE_IMAGES_PATH = './assets/images/mime/';
MIME_TYPE_DEFAULT_IMAGE_NAME = 'application-octet-stream.png';

@Input()
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ export class ClarinItemBoxViewComponent implements OnInit {

protected readonly AUTHOR_METADATA_FIELDS = AUTHOR_METADATA_FIELDS;

ITEM_TYPE_IMAGES_PATH = '/assets/images/item-types/';
ITEM_TYPE_IMAGES_PATH = './assets/images/item-types/';
ITEM_TYPE_DEFAULT_IMAGE_NAME = 'application-x-zerosize.png';

/**
6 changes: 3 additions & 3 deletions src/themes/dspace/app/header/header.component.html
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<nav class="lindat-navbar lindat-navbar-expand-lg lindat-justify-content-between lindat-navbar-dark ">
<div class="lindat-block lindat-block--clariah-theme-branding">
<a routerLink="/home" class="lindat-navbar-brand lindat-d-flex lindat-align-items-center " aria-label="">
<img src="/assets/images/LINDAT-CLARIAH-cz-gray_0.svg" width="auto" height="53" style="height: 53px !important;" alt="LINDAT/CLARIAH-CZ logo" class="" />
<img src="./assets/images/LINDAT-CLARIAH-cz-gray_0.svg" width="auto" height="53" style="height: 53px !important;" alt="LINDAT/CLARIAH-CZ logo" class="" />
</a>
</div>
<button class="lindat-navbar-toggler" type="button" data-toggle="collapse" data-target=".lindat-navbar-collapse" aria-controls="lindat-navbar-collapse" aria-expanded="false" aria-label="Toggle navigation"
@@ -54,10 +54,10 @@
<ul class="lindat-nav lindat-navbar-nav">
<li class="lindat-nav-item" id="margin-filler"></li>
<li class="lindat-nav-item ">
<a class="lindat-nav-link lindat-nav-link-dariah" href="https://www.dariah.eu/"><img src="/assets/images/dariah-eu.png" alt="DARIAH logo" /></a>
<a class="lindat-nav-link lindat-nav-link-dariah" href="https://www.dariah.eu/"><img src="./assets/images/dariah-eu.png" alt="DARIAH logo" /></a>
</li>
<li class="lindat-nav-item ">
<a class="lindat-nav-link lindat-nav-link-clarin" href="https://www.clarin.eu/"><img src="/assets/images/clarin.png" alt="CLARIN logo" /></a>
<a class="lindat-nav-link lindat-nav-link-clarin" href="https://www.clarin.eu/"><img src="./assets/images/clarin.png" alt="CLARIN logo" /></a>
</li>
</ul>
</div>