Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

269c282e

Commit 269c282e authored 4 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Development

See merge request !1848

parents 6fd0ad04 98f9147a

No related branches found

No related tags found

Loading

Changes 14
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.vscode/launch.json 2 additions, 2 deletions

.vscode/launch.json
DockerfileDev 4 additions, 4 deletions

DockerfileDev
app/Http/Controllers/MetaGerSearch.php 36 additions, 11 deletions

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

app/Http/Controllers/StartpageController.php
app/Http/Controllers/Stresstest.php 0 additions, 1 deletion

app/Http/Controllers/Stresstest.php
app/MetaGer.php 40 additions, 47 deletions

app/MetaGer.php
app/Models/Adgoal.php 85 additions, 57 deletions

app/Models/Adgoal.php
app/Models/Admitad.php 154 additions, 0 deletions

app/Models/Admitad.php
app/Models/Result.php 2 additions, 0 deletions

app/Models/Result.php
config/metager/metager.php 1 addition, 0 deletions

config/metager/metager.php
resources/lang/de/partnershops.php 1 addition, 1 deletion

resources/lang/de/partnershops.php
resources/lang/en/partnershops.php 2 additions, 2 deletions

resources/lang/en/partnershops.php
resources/views/spende/partnershops.blade.php 6 additions, 4 deletions

resources/views/spende/partnershops.blade.php
routes/web.php 2 additions, 2 deletions

routes/web.php

with 335 additions and 137 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