Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

mark-web
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

11e1b32b

Commit 11e1b32b authored 4 years ago by Alex

Downloads
- Plain Diff

Update branch with new Master updates

parents 5860e937 bdb5cab2

No related branches found

No related tags found

1 merge request!1Include Wowa Training

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.env.example 1 addition, 1 deletion

.env.example
Dockerfile 4 additions, 4 deletions

Dockerfile
app/Feedback.php 24 additions, 1 deletion

app/Feedback.php
app/Http/Controllers/MarkController.php 4 additions, 2 deletions

app/Http/Controllers/MarkController.php
app/Mark.php 16 additions, 4 deletions

app/Mark.php
app/Providers/RouteServiceProvider.php 1 addition, 1 deletion

app/Providers/RouteServiceProvider.php
composer.json 2 additions, 1 deletion

composer.json
composer.lock 29 additions, 14 deletions

composer.lock
docker-compose.yml 2 additions, 2 deletions

docker-compose.yml
resources/views/app/ranking.blade.php 1 addition, 1 deletion

resources/views/app/ranking.blade.php
resources/views/app/status.blade.php 20 additions, 0 deletions

resources/views/app/status.blade.php
routes/web.php 8 additions, 0 deletions

routes/web.php

with 112 additions and 31 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