Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lexp_www
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lexworkers
lexp_www
Compare revisions
0c1a722b23b07c0532a9a8f56768b2d37849e207 to c1e73accee36f4a66ee38ca005b8c2f48fa1c52e
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
lexworkers/lexp_www
Select target project
No results found
c1e73accee36f4a66ee38ca005b8c2f48fa1c52e
Select Git revision
Branches
master
tomekn-master-patch-34274
2 results
Swap
Target
lexworkers/lexp_www
Select target project
lexworkers/lexp_www
1 result
0c1a722b23b07c0532a9a8f56768b2d37849e207
Select Git revision
Branches
master
tomekn-master-patch-34274
2 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source
2
Develop
· 2635c84b
Bartosz Walkowiak
authored
Oct 27, 2023
2635c84b
Merge branch 'develop' into 'master'
· c1e73acc
Bartosz Walkowiak
authored
Oct 27, 2023
Develop See merge request
!2
c1e73acc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+4
-2
4 additions, 2 deletions
.gitlab-ci.yml
httpd.conf
+3
-3
3 additions, 3 deletions
httpd.conf
js/graph-creator.js
+2
-2
2 additions, 2 deletions
js/graph-creator.js
plwordnet/plwordnet.js
+3
-3
3 additions, 3 deletions
plwordnet/plwordnet.js
with
12 additions
and
10 deletions
.gitlab-ci.yml
View file @
c1e73acc
...
...
@@ -9,7 +9,9 @@ build_image:
services
:
-
docker:18.09.7-dind
script
:
-
docker build -t $CI_REGISTRY_IMAGE .
-
if [ "$CI_COMMIT_REF_NAME" == "master" ]; then TAG="latest"; else TAG="develop"; fi
-
docker build -t $CI_REGISTRY_IMAGE:$TAG .
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
docker push $CI_REGISTRY_IMAGE
-
docker push $CI_REGISTRY_IMAGE:$TAG
This diff is collapsed.
Click to expand it.
httpd.conf
View file @
c1e73acc
...
...
@@ -296,7 +296,7 @@ DocumentRoot "/usr/local/apache2/htdocs"
# is requested.
#
<
IfModule
dir_module
>
DirectoryIndex
index.html
DirectoryIndex
index.
s
html
</
IfModule
>
#
...
...
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
</
IfModule
>
ProxyPreserveHost
On
ProxyPass
/lexp/ http://lexp_service:8080/lex/
ProxyPassReverse
/lexp/ http://lexp_service:8080/lex/
\ No newline at end of file
ProxyPass
/lexp/ http://lexpservice:80/lex/
ProxyPassReverse
/lexp/ http://lexpservice:80/lex/
This diff is collapsed.
Click to expand it.
js/graph-creator.js
View file @
c1e73acc
This diff is collapsed.
Click to expand it.
plwordnet/plwordnet.js
View file @
c1e73acc
...
...
@@ -185,7 +185,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
'
<a href="/synsetid/plwordnet/
'
+
element2
.
synset
+
'
">
'
+
'
<p class="title">
'
+
element2
.
lemma
+
'
</p>
'
+
'
</a>
'
+
'
<img width="40" height="20" class="img-responsive show-icon" src="
http://lexp-dev.clarin-pl.eu/img/lang-
'
+
lang
+
'
-32.png" alt="Language" />
'
+
`
<img width="40" height="20" class="img-responsive show-icon" src="
/img/lang-
${
lang
}
-32.png" alt="Language" />
`
+
definition
+
horizontalLine
;
});
...
...
@@ -195,7 +195,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
let
data
=
'
<div class="plwordnet-box">
'
+
'
<h2>
'
+
'
<img class="img-responsive show-icon" src="
http://lexp-dev.clarin-pl.eu
/img/lang-
'
+
lang
+
'
-32.png" alt="Language" />
'
+
'
<img class="img-responsive show-icon" src="/img/lang-
'
+
lang
+
'
-32.png" alt="Language" />
'
+
'
<span lang="pl">
'
+
title
+
'
(
'
+
quantity
+
'
)
'
+
'
</span>
'
+
'
<span lang="en">
'
+
titleEn
+
'
(
'
+
quantity
+
'
)
'
+
'
</span>
'
+
'
</h2>
'
+
...
...
@@ -246,7 +246,7 @@ PlWordnet.prototype.showHTMLForSynset = function() {
'
<div class="fixed-space category"><span lang="pl">Słowo</span><span lang="en">Word</span></div>
'
+
'
<div class="fixed-space">
'
+
'
<h2 class="lemma">
'
+
element
.
lemma
+
'
</h2>
'
+
'
<img class="img-responsive show-icon" src="
http://lexp-dev.clarin-pl.eu
/img/lang-
'
+
language
+
'
-32.png" alt="Language" />
'
+
'
<img class="img-responsive show-icon" src="/img/lang-
'
+
language
+
'
-32.png" alt="Language" />
'
+
'
<p class="description">
'
+
definition
+
'
</p>
'
+
'
</div>
'
+
'
<hr />
'
+
...
...
This diff is collapsed.
Click to expand it.