torsten/tippspiel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel

Browse source
This commit is contained in:
Torsten 2023-01-30 15:42:36 +01:00
commit 7dcf2f14c6
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
.gi Normal file
View file

@ -0,0 +1,7 @@
:X
Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

4
pfosten/resources/views/tipps/index.blade.php
View file

@ -69,9 +69,9 @@
<!-- 4 in 1 functionality --> <!-- 4 in 1 functionality -->
@if(App\Round::hasLockedGame($round->id)!=true) @if(App\Round::hasLockedGame($round->id)!=true)
@if (Auth::user()->admin)
<a href="/tipps/edit4/{{$game->round_id}}">Runde Tippen</a> <a href="/tipps/edit4/{{$game->round_id}}">Runde Tippen</a>
@endif
@endif @endif