Merge branch '795-scopia-einbauen' into 'development' (0876937d) · 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

0876937d

Commit 0876937d authored 6 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '795-scopia-einbauen' into 'development'

Resolve "Scopia einbauen"

Closes #795

See merge request !1305

parents c0893c01 aea53e36

No related branches found

No related tags found

1 merge request!1305Resolve "Scopia einbauen"

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/FokiLoader.php 6 additions, 6 deletions

app/Http/Controllers/FokiLoader.php
app/Http/Controllers/StartpageController.php 8 additions, 8 deletions

app/Http/Controllers/StartpageController.php
app/Jobs/Searcher.php 101 additions, 87 deletions

app/Jobs/Searcher.php
app/MetaGer.php 23 additions, 6 deletions

app/MetaGer.php
app/Models/Searchengine.php 38 additions, 34 deletions

app/Models/Searchengine.php
app/Models/parserSkripte/Fastbot.php 0 additions, 49 deletions

app/Models/parserSkripte/Fastbot.php
app/Models/parserSkripte/Overture.php 14 additions, 13 deletions

app/Models/parserSkripte/Overture.php
app/Models/parserSkripte/Scopia.php 86 additions, 0 deletions

app/Models/parserSkripte/Scopia.php
resources/views/parts/foki.blade.php 8 additions, 0 deletions

resources/views/parts/foki.blade.php

with 284 additions and 203 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