Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

075761e0

Commit 075761e0 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !265

parents caad122b 785e20c0

No related branches found

No related tags found

1 merge request!1365Resolve "Filter Options for MetaGer"

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/MetaGer.php 1 addition, 6 deletions

app/MetaGer.php
app/Models/Result.php 2 additions, 2 deletions

app/Models/Result.php
app/Models/parserSkripte/Ebay.php 22 additions, 7 deletions

app/Models/parserSkripte/Ebay.php
app/Models/parserSkripte/Exalead.php 2 additions, 1 deletion

app/Models/parserSkripte/Exalead.php
app/Models/parserSkripte/Fairmondo.php 6 additions, 3 deletions

app/Models/parserSkripte/Fairmondo.php
app/Models/parserSkripte/Fernsehsuche.php 51 additions, 0 deletions

app/Models/parserSkripte/Fernsehsuche.php
app/Models/parserSkripte/Pixabay.php 52 additions, 0 deletions

app/Models/parserSkripte/Pixabay.php
public/css/styleResultPage.css 5 additions, 0 deletions

public/css/styleResultPage.css
resources/views/layouts/result.blade.php 10 additions, 1 deletion

resources/views/layouts/result.blade.php

with 151 additions and 20 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