Develop (!4) · Merge requests · open-source / MetaGer

Merged Dominik Hebeler requested to merge develop into master 8 years ago

May 04, 2016
- Merge branch 'develop' of http://gitlab.metager3.de:1234/dominik/MetaGer into develop · 1bc18ca4
  Dominik Hebeler authored 8 years ago
  
  1bc18ca4
- Dieser Ordner hätte gar nicht erst hinzugefügt werden dürfen! · c961209d
  Dominik Hebeler authored 8 years ago
  
  c961209d
May 03, 2016

Merge branch 'master' into 'develop' · af514e03

Dominik Hebeler authored 8 years ago

Master

Änderungen an der .gitlab-ci.yaml mussten direkt am Master-Branch durchgeführt werden.
Diese Änderungen sind nun fertig weshalb wir diese in den Develop Branch übernehmen.

Master Branch ist absofort "Protected"

See merge request !3

af514e03

Pull · 736cf210

karl authored 8 years ago

Merge branch 'develop' of http://gitlab.metager3.de:1234/dominik/MetaGer into develop

736cf210

* First approach on loading CSS · 16dc1b0d
karl authored 8 years ago

16dc1b0d

* Modified routes.php to redirect sub page requests with or without specified... · d246618d

karl authored 8 years ago

* Modified routes.php to redirect sub page requests with or without specified language towards the startpageContoller
+ Added Views for several subpages
* Modified staticpages.blade.php to work with the new subpages
+ Added subPages.blade.php for easier extension for subpages

d246618d

Develop

Merge request reports

Activity