Merge branch 'development' into 'Sprachdateien' (1bf5afb5) · 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

1bf5afb5

Commit 1bf5afb5 authored 7 years ago by Carsten Riel

Downloads
- Plain Diff

Merge branch 'development' into 'Sprachdateien'

Development

See merge request !996

parents 417e8299 fa1ae03b

No related branches found

No related tags found

3 merge requests!997Sprachdateien,!996Development,!987Development

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/MetaGerSearch.php 6 additions, 0 deletions

app/Http/Controllers/MetaGerSearch.php
resources/assets/js/scriptResultPage.js 1 addition, 1 deletion

resources/assets/js/scriptResultPage.js
resources/assets/less/metager/result-page.less 50 additions, 8 deletions

resources/assets/less/metager/result-page.less
resources/assets/less/metager/static-pages.less 0 additions, 11 deletions

resources/assets/less/metager/static-pages.less
resources/lang/de/result.php 2 additions, 0 deletions

resources/lang/de/result.php
resources/lang/en/hilfe.php 6 additions, 1 deletion

resources/lang/en/hilfe.php
resources/views/index.blade.php 12 additions, 5 deletions

resources/views/index.blade.php
resources/views/layouts/result.blade.php 34 additions, 30 deletions

resources/views/layouts/result.blade.php
resources/views/spende/spende.blade.php 65 additions, 65 deletions

resources/views/spende/spende.blade.php

with 176 additions and 121 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