Commits · 0936e26f4a5edaafe784604c90059087b143f2e0 · commul / MERLIN Platform / Web site

May 01, 2021
- content and links update · 0936e26f
  Karin Schöne authored 3 years ago
  
  0936e26f
- css: padding changed · f722647e
  Karin Schöne authored 3 years ago
  
  content update
  f722647e
Apr 06, 2021
- changes in font style, font size of left side menu and adjusting alignment of... · 2446b455
  Lyding Verena authored 3 years ago
  
  changes in font style, font size of left side menu and adjusting alignment of top bars with left menu and language choice
  2446b455
- changed left top menu (widget_polytopic) by replacing home with glossary... · 745ca09a
  Lyding Verena authored 3 years ago
  
  changed left top menu (widget_polytopic) by replacing home with glossary (help-annis-glossary) and removing about (the question mark)
  745ca09a
- removed F_searchmenu.php and div content-menu · d075f68d
  Lyding Verena authored 3 years ago
  
  d075f68d
- added translation field 'help_search' · 95ad8090
  Lyding Verena authored 3 years ago
  
  95ad8090
- home and simple point to F_entrance_page · 123496e0
  Lyding Verena authored 3 years ago
  
  123496e0
Mar 31, 2021
- Codierung (UTF-8) vereinheitlicht · 39609b97
  Karin Schöne authored 3 years ago
  
  39609b97
- div container set · 18e60b00
  Karin Schöne authored 3 years ago
  
  18e60b00
- minor changes (character, unicode symbols) · 8f58d136
  Karin Schöne authored 3 years ago
  
  8f58d136
- start.php replaced by neu-start.php · a6f21434
  Karin Schöne authored 3 years ago
  
  a6f21434
- minor changes (characters) · 34591335
  Karin Schöne authored 3 years ago
  
  34591335
- content update, button added (MERLIN Suche) · e9e70e38
  Karin Schöne authored 3 years ago
  
  e9e70e38
- icon update · 36e72121
  Karin Schöne authored 3 years ago
  
  36e72121
- img path correction · f0fc2bad
  Karin Schöne authored 3 years ago
  
  f0fc2bad
- img path revised, added: inhaltliche Sprünge, explizite Textverknüpfung · 82fa5b67
  Karin Schöne authored 3 years ago
  
  82fa5b67
Mar 27, 2021
- new content · 9d06e578
  Karin Schöne authored 4 years ago
  
  9d06e578
- img path revised · e201b9b2
  Karin Schöne authored 4 years ago
  
  e201b9b2
- Merge branch 'revisions/karin' into start_new · 95f6e447
  Karin Schöne authored 4 years ago
  
  95f6e447
- Revert "part 4 (statistics) and parts of part 3 deleted, img path correction" · c5efcd11
  Karin Schöne authored 4 years ago
  
  This reverts commit 738de59c.
  c5efcd11
- part 3 cut, part 4 deleted · 9bcc403a
  Karin Schöne authored 4 years ago
  
  9bcc403a
- part 4 (statistics) and parts of part 3 deleted, img path correction · 738de59c
  Karin Schöne authored 4 years ago
  
  738de59c
- Korrektur: #content-menu3 ol li · 23e7b46e
  Karin Schöne authored 4 years ago
  
  list-style-type: decimal
  23e7b46e
Mar 26, 2021
- Test CI/CD · 2bd3aae5
  egon w. stemle authored 4 years ago
  
  Verified
  
  2bd3aae5
- Update .gitlab-ci.yml · 610013e1
  egon w. stemle authored 4 years ago
  
  Verified
  
  610013e1
- Use CI on all branches · c02caee9
  egon w. stemle authored 4 years ago
  
  Verified
  
  c02caee9
- Merge branch 'master' into start_new · 2ddaa7bf
  egon w. stemle authored 4 years ago
  
  Update branch with work on .gitlab-ci and kustomize
  Verified
  
  2ddaa7bf
- Add kustomize basics · cfa033bb
  egon w. stemle authored 4 years ago
  
  Verified
  
  cfa033bb
Mar 24, 2021
- Add .gitlab-ci.yml · 445bc35d
  egon w. stemle authored 4 years ago
  
  Verified
  
  445bc35d
Mar 14, 2021
- #content-menu3 ol li · 0351240c
  Karin Schöne authored 4 years ago
  
  added
  0351240c
- changes to index.php, F_Entrance_page.php to adapt new home/start page · 28fe9620
  Karin Schöne authored 4 years ago
  
  neu-start.php replaces start.php
  28fe9620
Feb 19, 2021
- added for mcorpus and annotation · c49ad0f5
  Karin Schöne authored 4 years ago
  
  c49ad0f5
- size changed · 57831c25
  Karin Schöne authored 4 years ago
  
  57831c25
- changes to font-family, font-size, line-height; for details see comments in the stylesheet · a816a7bc
  Karin Schöne authored 4 years ago
  
  a816a7bc
- content update · 684e6c29
  Karin Schöne authored 4 years ago
  
  684e6c29
- content update · 164dc001
  Karin Schöne authored 4 years ago
  
  164dc001
Apr 28, 2020
- Add minimal docker-ised environment · 5174cf5f
  egon w. stemle authored 4 years ago
  
  Address #7
  5174cf5f
- Fix redirect to virtualkeyboard.ws: add sandbox param to iframe · d3f9d7e8
  egon w. stemle authored 4 years ago
  
  d3f9d7e8
- Set all files to CRLF (dos) new line; remove BOM from utf-8 files · 84de3cd4
  egon w. stemle authored 4 years ago
  
  84de3cd4
Mar 18, 2019
- Merge branch 'fix-4' · e532484d
  egon w. stemle authored 6 years ago
  
  e532484d