Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

J

jdev-boarding
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

3026dff1

Commit 3026dff1 authored 4 years ago by François Agneray

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop

See merge request !42

parents e552dda8 a4c79b9c

No related branches found

No related tags found

1 merge request!42Develop

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

app/actions.php 1 addition, 1 deletion

app/actions.php
app/src/Action/DashboardAdminAgendaFormAction.php 3 additions, 0 deletions

app/src/Action/DashboardAdminAgendaFormAction.php
app/src/Action/DashboardParticipantParcoursFormationAction.php 11 additions, 13 deletions

...rc/Action/DashboardParticipantParcoursFormationAction.php
app/templates/dashboard_admin_parcours_agenda.twig 3 additions, 27 deletions

app/templates/dashboard_admin_parcours_agenda.twig
app/templates/dashboard_participant_parcours_agenda.twig 6 additions, 31 deletions

app/templates/dashboard_participant_parcours_agenda.twig
public/js/admin.js 4 additions, 2 deletions

public/js/admin.js
public/js/participant.js 2 additions, 1 deletion

public/js/participant.js

with 30 additions and 75 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