Merge branch 'development' into 169-produktsuche-bilder-sind-verzerrt (e353bf28) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e353bf28

Commit e353bf28 authored 8 years ago by Phil Höfer

Downloads
- Plain Diff

Merge branch 'development' into 169-produktsuche-bilder-sind-verzerrt

parents 5b35c25e 6eb456ce

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/LogController.php 18 additions, 0 deletions

app/Http/Controllers/LogController.php
app/Http/Controllers/StartpageController.php 6 additions, 5 deletions

app/Http/Controllers/StartpageController.php
app/Http/routes.php 3 additions, 1 deletion

app/Http/routes.php
app/MetaGer.php 12 additions, 7 deletions

app/MetaGer.php
public/css/styleResultPage.css 24 additions, 1 deletion

public/css/styleResultPage.css
public/js/scriptResultPage.js 17 additions, 0 deletions

public/js/scriptResultPage.js
resources/lang/de/index.php 4 additions, 9 deletions

resources/lang/de/index.php
resources/views/index.blade.php 4 additions, 9 deletions

resources/views/index.blade.php
resources/views/layouts/researchandtabs.blade.php 10 additions, 1 deletion

resources/views/layouts/researchandtabs.blade.php
resources/views/layouts/resultPage.blade.php 2 additions, 0 deletions

resources/views/layouts/resultPage.blade.php
resources/views/layouts/staticPages.blade.php 2 additions, 1 deletion

resources/views/layouts/staticPages.blade.php
resources/views/plugin.blade.php 1 addition, 1 deletion

resources/views/plugin.blade.php

with 103 additions and 35 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