Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

2a6f46d6

Commit 2a6f46d6 authored 5 years ago by Guillaume Heurtier

Downloads
- Patches
- Plain Diff

FEAT #12069 TIME 1:30 fix merge message in dialog + show only tag that can be merged in list

parent ab42104d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/app/tag/controllers/TagController.php 25 additions, 0 deletions

src/app/tag/controllers/TagController.php
src/app/tag/models/TagModel.php 9 additions, 8 deletions

src/app/tag/models/TagModel.php
src/frontend/app/administration/tag/tag-administration.component.html 2 additions, 2 deletions

.../app/administration/tag/tag-administration.component.html
src/frontend/app/administration/tag/tag-administration.component.ts 7 additions, 2 deletions

...nd/app/administration/tag/tag-administration.component.ts
src/frontend/lang/lang-en.ts 4 additions, 2 deletions

src/frontend/lang/lang-en.ts
src/frontend/lang/lang-fr.ts 7 additions, 5 deletions

src/frontend/lang/lang-fr.ts
src/frontend/lang/lang-nl.ts 3 additions, 1 deletion

src/frontend/lang/lang-nl.ts

with 57 additions and 20 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