Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

3c2a5274

Commit 3c2a5274 authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1040

parents e2111be1 b4ac49b8

No related branches found

No related tags found

Loading

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/LanguageController.php 64 additions, 41 deletions

app/Http/Controllers/LanguageController.php
app/MetaGer.php 2 additions, 2 deletions

app/MetaGer.php
app/Models/LanguageObject.php 2 additions, 1 deletion

app/Models/LanguageObject.php
public/js/scriptSubPages.js 2 additions, 3 deletions

public/js/scriptSubPages.js
resources/assets/js/scriptStartPage.js 5 additions, 0 deletions

resources/assets/js/scriptStartPage.js
resources/lang/de/faq.php 1 addition, 2 deletions

resources/lang/de/faq.php
resources/lang/de/languages.php 2 additions, 1 deletion

resources/lang/de/languages.php
resources/views/languages/synoptic.blade.php 13 additions, 2 deletions

resources/views/languages/synoptic.blade.php
resources/views/layouts/staticPages.blade.php 2 additions, 2 deletions

resources/views/layouts/staticPages.blade.php
routes/web.php 2 additions, 2 deletions

routes/web.php

with 95 additions and 56 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment