Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
submeta
Commits
36fdbf98
Unverified
Commit
36fdbf98
authored
3 years ago
by
GuilhermeGz
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #195 from GuilhermeGz/master
Atualizações do sistema
parents
fc44964c
768e06e6
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
dependabot/composer/guzzlehttp/guzzle-6.5.8
dependabot/composer/symfony/http-kernel-4.4.50
dependabot/npm_and_yarn/decode-uri-component-0.2.2
dependabot/npm_and_yarn/express-4.18.2
dependabot/npm_and_yarn/json5-and-json5-2.2.3
dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2
dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8
dependabot/npm_and_yarn/qs-and-express-6.11.0
excluir_projeto_submetido
updates_mar
No related merge requests found
Changes
44
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
resources/views/proponente/projetos.blade.php
+3
-0
resources/views/proponente/projetos.blade.php
resources/views/proponente/projetosEdital.blade.php
+6
-0
resources/views/proponente/projetosEdital.blade.php
resources/views/vendor/notifications/email.blade.php
+2
-3
resources/views/vendor/notifications/email.blade.php
routes/web.php
+1
-1
routes/web.php
with
12 additions
and
4 deletions
+12
-4
resources/views/proponente/projetos.blade.php
View file @
36fdbf98
...
@@ -191,6 +191,9 @@
...
@@ -191,6 +191,9 @@
@
endif
@
endif
@
endif
@
endif
</
div
>
</
div
>
<
div
class
=
"col-md-12"
style
=
"padding-left: 20px"
>
{{
$projetos
->
links
()
}}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/proponente/projetosEdital.blade.php
View file @
36fdbf98
...
@@ -199,10 +199,16 @@
...
@@ -199,10 +199,16 @@
</
div
>
</
div
>
@
endif
@
endif
</
div
>
</
div
>
<
div
class
=
"col-md-12"
style
=
"padding-left: 20px"
>
{{
$projetos
->
links
()
}}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endsection
@
endsection
@
section
(
'javascript'
)
@
section
(
'javascript'
)
...
...
This diff is collapsed.
Click to expand it.
resources/views/vendor/notifications/email.blade.php
View file @
36fdbf98
...
@@ -44,9 +44,8 @@
...
@@ -44,9 +44,8 @@
{{ $salutation }}
{{ $salutation }}
@else
@else
<br>
@lang('Atenciosamente'),
<br>
<br>
@lang('Atenciosamente'),
<br>
{{ config('app.name') }}
<br><br>
{{--{{ config('app.name') }}
<br><br>
--}}
Laboratório Multidisciplinar de Tecnologias Sociais
<br>
Universidade Federal do Agreste de Pernambuco
<br>
Universidade Federal do Agreste de Pernambuco
@endif
@endif
{{-- Subcopy --}}
{{-- Subcopy --}}
...
...
This diff is collapsed.
Click to expand it.
routes/web.php
View file @
36fdbf98
...
@@ -149,7 +149,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
...
@@ -149,7 +149,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
//########## Bolsas
//########## Bolsas
Route
::
get
(
'/bolsas'
,
'ParticipanteController@listarParticipanteEdital'
)
->
name
(
'bolsas.listar'
);
Route
::
get
(
'/bolsas'
,
'ParticipanteController@listarParticipanteEdital'
)
->
name
(
'bolsas.listar'
);
Route
::
ge
t
(
'/bolsas/alteracao
/{id}/{tipo}
'
,
'ParticipanteController@alterarBolsa'
)
->
name
(
'bolsa.alterar'
);
Route
::
pos
t
(
'/bolsas/alteracao'
,
'ParticipanteController@alterarBolsa'
)
->
name
(
'bolsa.alterar'
);
//########## Relatórios
//########## Relatórios
Route
::
get
(
'/projeto/planosTrabalho/{id}'
,
'ArquivoController@listar'
)
->
name
(
'planos.listar'
);
Route
::
get
(
'/projeto/planosTrabalho/{id}'
,
'ArquivoController@listar'
)
->
name
(
'planos.listar'
);
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help