Commits · 11f3358f018de848764fc9620b6da987260b1140 · commul / MERLIN Platform / Web site

Aug 27, 2018
- Fix http/https 'Mixed Content' warning · 11f3358f
  egon w. stemle authored 6 years ago
  
  11f3358f
Aug 10, 2018
- Add Barbora Štindlová · 4d95eab6
  egon w. stemle authored 6 years ago
  
  4d95eab6
Apr 23, 2018
- Update last modified date · ea349df7
  egon w. stemle authored 6 years ago
  
  ea349df7
- Merge branch 'master' of sdcsfe03.eurac.edu:merlin-webpage.repo · 8068037b
  egon w. stemle authored 6 years ago
  
  8068037b
Feb 23, 2018

add THIS_IS for debugging/testing DNS updates · daa42cf2
egon w. stemle authored 9 years ago

daa42cf2

egon w. stemle authored 7 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4442 71ad02bc-cbdd-11db-a10a-ee346e295fe1

001a3be9

Fix vertical align · c3483922

egon w. stemle authored 7 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4441 71ad02bc-cbdd-11db-a10a-ee346e295fe1

c3483922

Add license: CC-BY-SA · d0daf54f

egon w. stemle authored 7 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4440 71ad02bc-cbdd-11db-a10a-ee346e295fe1

d0daf54f

Jun 10, 2016

· 46f2d899

Lyding Verena authored 8 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4167 71ad02bc-cbdd-11db-a10a-ee346e295fe1

46f2d899

Jun 09, 2016

· d374b265

Lyding Verena authored 8 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4158 71ad02bc-cbdd-11db-a10a-ee346e295fe1

d374b265

Jun 08, 2016

· a9bf1b75

Lyding Verena authored 8 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4147 71ad02bc-cbdd-11db-a10a-ee346e295fe1

a9bf1b75

· af51124d

Lyding Verena authored 8 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4145 71ad02bc-cbdd-11db-a10a-ee346e295fe1

af51124d

Jun 07, 2016

· b4317be8

Lyding Verena authored 8 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4131 71ad02bc-cbdd-11db-a10a-ee346e295fe1

b4317be8

Mar 08, 2016

bug repair · 2a57a443

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@4111 71ad02bc-cbdd-11db-a10a-ee346e295fe1

2a57a443

Aug 19, 2015

· a075a56a

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3923 71ad02bc-cbdd-11db-a10a-ee346e295fe1

a075a56a

zips with corpus files modified to contain WIN EOL · 39a6310c

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3922 71ad02bc-cbdd-11db-a10a-ee346e295fe1

39a6310c

Jul 22, 2015

corrections on Czech · f9c3c819

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3827 71ad02bc-cbdd-11db-a10a-ee346e295fe1

f9c3c819

Jul 21, 2015

· aba69fe3

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3826 71ad02bc-cbdd-11db-a10a-ee346e295fe1

aba69fe3

correction on cz · cf64cf2c

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3825 71ad02bc-cbdd-11db-a10a-ee346e295fe1

cf64cf2c

change of server address, to be accessible from outside · d3e51304

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3824 71ad02bc-cbdd-11db-a10a-ee346e295fe1

d3e51304

Jul 20, 2015
- add THIS_IS for debugging/testing DNS updates · 7568da4b
  egon w. stemle authored 9 years ago
  
  7568da4b
Jul 17, 2015

correction of paths in .css files · 5d3bca86

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3817 71ad02bc-cbdd-11db-a10a-ee346e295fe1

5d3bca86

zips of corpus documents added · adfeed17

Lyding Verena authored 9 years ago

links to images updated in css/atooltip.css css/style.css and js/utils_MERLIN.js

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3816 71ad02bc-cbdd-11db-a10a-ee346e295fe1

adfeed17

adjusted paths in response to adjusted folder structure · 808869fa

Lyding Verena authored 9 years ago

../php/bla -> bla

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3815 71ad02bc-cbdd-11db-a10a-ee346e295fe1

808869fa

path adjustments according to adjusted folder structure: · 350dd4eb

Lyding Verena authored 9 years ago

static/styles -> css
static/scripts/js -> js
style -> img

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3814 71ad02bc-cbdd-11db-a10a-ee346e295fe1

350dd4eb

Jul 16, 2015

rm img/{Thumbs.db,style.css} · 342109d2

egon w. stemle authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3810 71ad02bc-cbdd-11db-a10a-ee346e295fe1

342109d2

rebasing documents - php into root, some minor changes · a4ffb2cf

egon w. stemle authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3809 71ad02bc-cbdd-11db-a10a-ee346e295fe1

a4ffb2cf

change from absolute to relative links in all content language pages · 7c6ee779

Lyding Verena authored 9 years ago

added documents under docs

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3808 71ad02bc-cbdd-11db-a10a-ee346e295fe1

7c6ee779

Jul 14, 2015

typo · e2758655

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3801 71ad02bc-cbdd-11db-a10a-ee346e295fe1

e2758655

update of server addresses from tuebingen to EURAC · 7218d47f

Lyding Verena authored 9 years ago

direct link to index_help.php page

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3800 71ad02bc-cbdd-11db-a10a-ee346e295fe1

7218d47f

update of absolute to relative links · b87a3625

Lyding Verena authored 9 years ago

tail.php in C.php file

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3798 71ad02bc-cbdd-11db-a10a-ee346e295fe1

b87a3625

fix:duplicate code header and language selection · 275b3d88

egon w. stemle authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3797 71ad02bc-cbdd-11db-a10a-ee346e295fe1

275b3d88

de-BOM files · f7ba6f5f

egon w. stemle authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3796 71ad02bc-cbdd-11db-a10a-ee346e295fe1

f7ba6f5f

missing tutorial thumbnail · def5a63b

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3795 71ad02bc-cbdd-11db-a10a-ee346e295fe1

def5a63b

Jul 09, 2015

old files · 5fa5759d

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3779 71ad02bc-cbdd-11db-a10a-ee346e295fe1

5fa5759d

old files · c63971fa

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3778 71ad02bc-cbdd-11db-a10a-ee346e295fe1

c63971fa

old files · 9443a4c5

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3777 71ad02bc-cbdd-11db-a10a-ee346e295fe1

9443a4c5

old files · 0da0a4ae

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3776 71ad02bc-cbdd-11db-a10a-ee346e295fe1

0da0a4ae

Jul 08, 2015

merlin interface · 71ab0a9d

Lyding Verena authored 9 years ago

git-svn-id: https://sdcsvn01.eurac.edu/svn/commul/MERLIN/merlin-webpage@3772 71ad02bc-cbdd-11db-a10a-ee346e295fe1

71ab0a9d