Merge branch 'feat/admin' into 'dev' (b80b46e6) · Commits · POINTUD AXEL / clone-mcdo-info4 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

clone-mcdo-info4
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

POINTUD AXEL
clone-mcdo-info4
Commits
b80b46e6

Commit b80b46e6 authored 2 years ago by

POINTUD AXEL

Downloads
- Plain Diff

Merge branch 'feat/admin' into 'dev'

Feat/admin

See merge request !5

parents 3fab2cd2 37b5d8c6

Branches

2 merge requests!6Dev,!5Feat/admin

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/Controller/CategoryController.php 17 additions, 6 deletions

src/Controller/CategoryController.php
templates/category/_form.html.twig 20 additions, 3 deletions

templates/category/_form.html.twig
templates/category/edit.html.twig 10 additions, 13 deletions

templates/category/edit.html.twig
templates/category/error.html.twig 9 additions, 0 deletions

templates/category/error.html.twig
templates/category/index.html.twig 75 additions, 31 deletions

templates/category/index.html.twig
templates/category/new.html.twig 10 additions, 11 deletions

templates/category/new.html.twig
templates/product/index.html.twig 16 additions, 7 deletions

templates/product/index.html.twig

with 157 additions and 71 deletions

0% 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