Merge branch '646-ubersetzung-fur-js-dateien-einbauen' into 'development' (0a1e47ae) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0a1e47ae

Commit 0a1e47ae authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '646-ubersetzung-fur-js-dateien-einbauen' into 'development'

Resolve "Übersetzung für JS-Dateien einbauen"

Closes #646

See merge request !1137

parents 3961206c 079e98e5

No related branches found

No related tags found

Loading

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

gulpfile.js 1 addition, 0 deletions

gulpfile.js
public/js/searchbar.js 425 additions, 0 deletions

public/js/searchbar.js
public/js/settings.js 2 additions, 22 deletions

public/js/settings.js
public/js/translations.js 44 additions, 0 deletions

public/js/translations.js
resources/assets/js/scriptStartPage.js 6 additions, 14 deletions

resources/assets/js/scriptStartPage.js
resources/assets/js/translations.js 43 additions, 0 deletions

resources/assets/js/translations.js
resources/views/index.blade.php 56 additions, 55 deletions

resources/views/index.blade.php
resources/views/layouts/resultPage.blade.php 1 addition, 1 deletion

resources/views/layouts/resultPage.blade.php
resources/views/settings.blade.php 1 addition, 0 deletions

resources/views/settings.blade.php

with 579 additions and 92 deletions

Loading

Dominik Hebeler @dominik
mentioned in commit 9ffb94a3
· 7 years ago

mentioned in commit 9ffb94a3

mentioned in commit 9ffb94a39852a983ec8c8444f6594b3baa526053

Toggle commit list

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