Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lexp_www
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Redmine
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
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
Swap
Target
lexworkers/lexp_www
Select target project
lexworkers/lexp_www
1 result
0c1a722b23b07c0532a9a8f56768b2d37849e207
Select Git revision
Branches
master
tomekn-master-patch-34274
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
1 year ago
2635c84b
Merge branch 'develop' into 'master'
· c1e73acc
Bartosz Walkowiak
authored
1 year ago
Develop See merge request
!2
c1e73acc
Expand all
Hide 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:
...
@@ -9,7 +9,9 @@ build_image:
services
:
services
:
-
docker:18.09.7-dind
-
docker:18.09.7-dind
script
:
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 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"
...
@@ -296,7 +296,7 @@ DocumentRoot "/usr/local/apache2/htdocs"
# is requested.
# is requested.
#
#
<
IfModule
dir_module
>
<
IfModule
dir_module
>
DirectoryIndex
index.html
DirectoryIndex
index.
s
html
</
IfModule
>
</
IfModule
>
#
#
...
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
...
@@ -550,5 +550,5 @@ SSLRandomSeed connect builtin
</
IfModule
>
</
IfModule
>
ProxyPreserveHost
On
ProxyPreserveHost
On
ProxyPass
/lexp/ http://lexp_service:8080/lex/
ProxyPass
/lexp/ http://lexpservice:80/lex/
ProxyPassReverse
/lexp/ http://lexp_service:8080/lex/
ProxyPassReverse
/lexp/ http://lexpservice:80/lex/
\ No newline at end of file
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
...
@@ -185,7 +185,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
'
<a href="/synsetid/plwordnet/
'
+
element2
.
synset
+
'
">
'
+
'
<a href="/synsetid/plwordnet/
'
+
element2
.
synset
+
'
">
'
+
'
<p class="title">
'
+
element2
.
lemma
+
'
</p>
'
+
'
<p class="title">
'
+
element2
.
lemma
+
'
</p>
'
+
'
</a>
'
+
'
</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
+
definition
+
horizontalLine
;
horizontalLine
;
});
});
...
@@ -195,7 +195,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
...
@@ -195,7 +195,7 @@ PlWordnet.prototype.createAdditionalInfo = function(jsonData, title, titleEn, la
let
data
=
let
data
=
'
<div class="plwordnet-box">
'
+
'
<div class="plwordnet-box">
'
+
'
<h2>
'
+
'
<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="pl">
'
+
title
+
'
(
'
+
quantity
+
'
)
'
+
'
</span>
'
+
'
<span lang="en">
'
+
titleEn
+
'
(
'
+
quantity
+
'
)
'
+
'
</span>
'
+
'
<span lang="en">
'
+
titleEn
+
'
(
'
+
quantity
+
'
)
'
+
'
</span>
'
+
'
</h2>
'
+
'
</h2>
'
+
...
@@ -246,7 +246,7 @@ PlWordnet.prototype.showHTMLForSynset = function() {
...
@@ -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 category"><span lang="pl">Słowo</span><span lang="en">Word</span></div>
'
+
'
<div class="fixed-space">
'
+
'
<div class="fixed-space">
'
+
'
<h2 class="lemma">
'
+
element
.
lemma
+
'
</h2>
'
+
'
<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>
'
+
'
<p class="description">
'
+
definition
+
'
</p>
'
+
'
</div>
'
+
'
</div>
'
+
'
<hr />
'
+
'
<hr />
'
+
...
...
This diff is collapsed.
Click to expand it.