Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Vidéos
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

001ed2d4

Unverified Commit 001ed2d4 authored 5 years ago by Chocobozzz

Downloads
- Plain Diff

Merge branch 'release/1.4.0' into develop

parents d5c8932a 60c2bc80

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

client/angular.json 4 additions, 2 deletions

client/angular.json
client/e2e/proxy.config.json 37 additions, 0 deletions

client/e2e/proxy.config.json
client/src/app/+admin/plugins/shared/plugin-list.component.scss 1 addition, 0 deletions

.../src/app/+admin/plugins/shared/plugin-list.component.scss
client/src/app/app.component.ts 10 additions, 3 deletions

client/src/app/app.component.ts
client/src/app/core/confirm/confirm.service.ts 6 additions, 2 deletions

client/src/app/core/confirm/confirm.service.ts
client/src/app/shared/confirm/confirm.component.ts 7 additions, 1 deletion

client/src/app/shared/confirm/confirm.component.ts
client/src/app/shared/misc/constants.ts 1 addition, 0 deletions

client/src/app/shared/misc/constants.ts
client/src/app/videos/+video-watch/video-watch.component.ts 4 additions, 2 deletions

client/src/app/videos/+video-watch/video-watch.component.ts
server/controllers/lazy-static.ts 2 additions, 0 deletions

server/controllers/lazy-static.ts

with 72 additions and 10 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