Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

fe1ffd74

Commit fe1ffd74 authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development



See merge request !160

parents 5a276d2a 3440c58c

No related branches found

No related tags found

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

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MetaGerSearch.php 1 addition, 2 deletions

app/Http/Controllers/MetaGerSearch.php
app/Http/Controllers/StartpageController.php 1 addition, 1 deletion

app/Http/Controllers/StartpageController.php
app/MetaGer.php 1 addition, 1 deletion

app/MetaGer.php
app/Models/Result.php 8 additions, 10 deletions

app/Models/Result.php
app/Models/lang.pl 10 additions, 0 deletions

app/Models/lang.pl
public/js/settings.js 3 additions, 3 deletions

public/js/settings.js
readme.md 5 additions, 5 deletions

readme.md
resources/lang/de/settings.php 2 additions, 0 deletions

resources/lang/de/settings.php
resources/lang/en/settings.php 2 additions, 0 deletions

resources/lang/en/settings.php
resources/views/index.blade.php 7 additions, 4 deletions

resources/views/index.blade.php
resources/views/layouts/staticPages.blade.php 3 additions, 3 deletions

resources/views/layouts/staticPages.blade.php
resources/views/settings.blade.php 5 additions, 4 deletions

resources/views/settings.blade.php

with 48 additions and 33 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