Commits · f1c3cd3c66f8d06365083e7f87fc7efe74077888 · m4lab_tv1 / customization simpleSAMLphp

19 Nov, 2020 5 commits
- Merge branch 'prepare_prod' into 'master' · f1c3cd3c
  Wolfgang Knopki authored Nov 19, 2020
```
Prepare prod

See merge request !50
```
  f1c3cd3c
- Merge branch 'prep' into 'prepare_prod' · 7166464d
  Wolfgang Knopki authored Nov 19, 2020
```
Prep

See merge request !49
```
  7166464d
- Merge branch 'prepare_prod' into 'prep' · 7efde877
  Wolfgang Knopki authored Nov 19, 2020
```
# Conflicts:
#   mymodule/themes/fancytheme/default/includes/header.php
```
  7efde877
- Merge branch 'patch-1' into 'testing' · 669f57dc
  Wolfgang Knopki authored Nov 19, 2020
```
Update .gitlab-ci.yml, change master deploymnet branch

See merge request !46
```
  669f57dc
- Update .gitlab-ci.yml, change master deploymnet branch · b93c36a2
  Wolfgang Knopki authored Nov 19, 2020
  
  b93c36a2
13 Nov, 2020 8 commits
- Merge branch 'templates' into 'testing' · 15e761dc
  Wolfgang Knopki authored Nov 13, 2020
```
admin field, global css Login-clean

See merge request !45
```
  15e761dc
- admin field, global css Login-clean · b0e9dff4
  Wolfgang Knopki authored Nov 13, 2020
  
  b0e9dff4
- Merge branch 'templates' into 'testing' · 2b58afca
  Wolfgang Knopki authored Nov 13, 2020
```
added admin loginform

See merge request !44
```
  2b58afca
- added admin loginform · e0b5eff5
  Wolfgang Knopki authored Nov 13, 2020
  
  e0b5eff5
- Merge branch 'templates' into 'testing' · 1569445c
  Wolfgang Knopki authored Nov 13, 2020
```
added admin loginform

See merge request !43
```
  1569445c
- added admin loginform · 6e47a241
  Wolfgang Knopki authored Nov 13, 2020
  
  6e47a241
- Merge branch 'templates' into 'testing' · 02096caf
  Wolfgang Knopki authored Nov 13, 2020
```
footer/ header adapted

See merge request !42
```
  02096caf
- footer/ header adapted · d0b08085
  Wolfgang Knopki authored Nov 13, 2020
  
  d0b08085
12 Nov, 2020 26 commits
- Merge branch 'templates' into 'testing' · b058d005
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass stylesheet

See merge request !41
```
  b058d005
- added twig loginuserpass stylesheet · 72268e2c
  Wolfgang Knopki authored Nov 12, 2020
  
  72268e2c
- Merge branch 'templates' into 'testing' · 095a13fa
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass

See merge request !40
```
  095a13fa
- added twig loginuserpass · dc2086e1
  Wolfgang Knopki authored Nov 12, 2020
  
  dc2086e1
- Merge branch 'templates' into 'testing' · 1d4d5b60
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass

See merge request !39
```
  1d4d5b60
- added twig loginuserpass · e528b499
  Wolfgang Knopki authored Nov 12, 2020
  
  e528b499
- Merge branch 'templates' into 'testing' · 88efa930
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass

See merge request !38
```
  88efa930
- added twig loginuserpass · e366d436
  Wolfgang Knopki authored Nov 12, 2020
  
  e366d436
- Merge branch 'templates' into 'testing' · af441e94
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass

See merge request !37
```
  af441e94
- added twig loginuserpass · 43f239e4
  Wolfgang Knopki authored Nov 12, 2020
  
  43f239e4
- Merge branch 'templates' into 'testing' · ea7bd8fb
  Wolfgang Knopki authored Nov 12, 2020
```
added twig loginuserpass

See merge request !36
```
  ea7bd8fb
- added twig loginuserpass · 3de5ccad
  Wolfgang Knopki authored Nov 12, 2020
  
  3de5ccad
- Merge branch 'templates' into 'testing' · f69d6f64
  Wolfgang Knopki authored Nov 12, 2020
```
footer added scripts

See merge request !35
```
  f69d6f64
- footer added scripts · b5c6f98b
  Wolfgang Knopki authored Nov 12, 2020
  
  b5c6f98b
- Merge branch 'templates' into 'testing' · 7913884d
  Wolfgang Knopki authored Nov 12, 2020
```
added different stylesheet

See merge request !34
```
  7913884d
- added different stylesheet · 1d9fadd9
  Wolfgang Knopki authored Nov 12, 2020
  
  1d9fadd9
- Merge branch 'templates' into 'testing' · 8467d05c
  Wolfgang Knopki authored Nov 12, 2020
```
added different stylesheet

See merge request !33
```
  8467d05c
- added different stylesheet · cfe54f08
  Wolfgang Knopki authored Nov 12, 2020
  
  cfe54f08
- Merge branch 'templates' into 'testing' · 164e3b80
  Wolfgang Knopki authored Nov 12, 2020
```
added different stylesheet

See merge request !32
```
  164e3b80
- added different stylesheet · d9c0b272
  Wolfgang Knopki authored Nov 12, 2020
  
  d9c0b272
- Merge branch 'templates' into 'testing' · 9bb5aa1a
  Wolfgang Knopki authored Nov 12, 2020
```
added base twig file

See merge request !31
```
  9bb5aa1a
- added base twig file · 0eeffc3c
  Wolfgang Knopki authored Nov 12, 2020
  
  0eeffc3c
- Merge branch 'templates' into 'testing' · cfdbdeb5
  Wolfgang Knopki authored Nov 12, 2020
```
added twig files

See merge request !29
```
  cfdbdeb5
- added twig files · b045c71c
  Wolfgang Knopki authored Nov 12, 2020
  
  b045c71c
- Merge branch 'localization' into 'testing' · 450425d3
  Wolfgang Knopki authored Nov 12, 2020
```
added localization

See merge request !28
```
  450425d3
- added localization · 24ca9578
  Wolfgang Knopki authored Nov 12, 2020
  
  24ca9578
11 Nov, 2020 1 commit
- Merge branch 'patch-1' into 'testing' · 37bcdb37
  Wolfgang Knopki authored Nov 11, 2020
```
Update .gitlab-ci.yml, test deployment new server

See merge request !27
```
  37bcdb37