Merge branch 'Bugfix' into 'master' (562fb3e1) · 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

562fb3e1

Commit 562fb3e1 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'Bugfix' into 'master'

Bugfix



See merge request !68

parents 655a0c75 1ffca2be

No related branches found

No related tags found

Loading

Changes 10
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/StartpageController.php 32 additions, 0 deletions

app/Http/Controllers/StartpageController.php
app/Http/routes.php 1 addition, 0 deletions

app/Http/routes.php
app/MetaGer.php 54 additions, 19 deletions

app/MetaGer.php
app/Models/Searchengine.php 12 additions, 1 deletion

app/Models/Searchengine.php
public/js/scriptStartPage.js 3 additions, 3 deletions

public/js/scriptStartPage.js
public/js/settings.js 4 additions, 0 deletions

public/js/settings.js
resources/views/layouts/staticPages.blade.php 1 addition, 1 deletion

resources/views/layouts/staticPages.blade.php
resources/views/metager3bilderresults.blade.php 14 additions, 0 deletions

resources/views/metager3bilderresults.blade.php
resources/views/plugin.blade.php 9 additions, 0 deletions

resources/views/plugin.blade.php
resources/views/settings.blade.php 1 addition, 0 deletions

resources/views/settings.blade.php

with 131 additions and 24 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