Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

80f0ebcc

Commit 80f0ebcc authored 8 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/development' into 126-spendenaufruf-einbauen

parents e3e2811a e7890b5d

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/AdminInterface.php 64 additions, 1 deletion

app/Http/Controllers/AdminInterface.php
app/Http/routes.php 2 additions, 0 deletions

app/Http/routes.php
app/MetaGer.php 6 additions, 2 deletions

app/MetaGer.php
app/Providers/AppServiceProvider.php 23 additions, 16 deletions

app/Providers/AppServiceProvider.php
public/js/scriptStartPage.js 0 additions, 11 deletions

public/js/scriptStartPage.js
resources/views/admin/admin.blade.php 0 additions, 0 deletions

resources/views/admin/admin.blade.php
resources/views/admin/check.blade.php 9 additions, 0 deletions

resources/views/admin/check.blade.php
resources/views/admin/count.blade.php 36 additions, 0 deletions

resources/views/admin/count.blade.php
resources/views/datenschutz.blade.php 0 additions, 4 deletions

resources/views/datenschutz.blade.php
resources/views/layouts/staticPages.blade.php 1 addition, 8 deletions

resources/views/layouts/staticPages.blade.php
storage/app/public/_ads.txt 0 additions, 8 deletions

storage/app/public/_ads.txt
storage/app/public/ads.txt 4 additions, 3 deletions

storage/app/public/ads.txt

with 145 additions and 53 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