Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

8db03cea

Commit 8db03cea authored 5 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1461

parents 5545a731 57372dd7

No related branches found

No related tags found

Loading

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
app/MetaGer.php 87 additions, 68 deletions

app/MetaGer.php
app/Models/Searchengine.php 26 additions, 4 deletions

app/Models/Searchengine.php
app/Models/XmlSearchengine.php 18 additions, 0 deletions

app/Models/XmlSearchengine.php
app/Models/parserSkripte/Overture.php 1 addition, 1 deletion

app/Models/parserSkripte/Overture.php
app/Models/parserSkripte/Qualigo.php 15 additions, 14 deletions

app/Models/parserSkripte/Qualigo.php
resources/views/parts/searchbar.blade.php 1 addition, 1 deletion

resources/views/parts/searchbar.blade.php
routes/web.php 2 additions, 9 deletions

routes/web.php
storage/framework/cache/data/.gitignore 0 additions, 2 deletions

storage/framework/cache/data/.gitignore

with 152 additions and 101 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