Merge branch '408-arbeit-am-ubersetzungstool' into 'development' (c65f788c) · 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

c65f788c

Commit c65f788c authored 7 years ago by Dominik Hebeler

Downloads
- Plain Diff

Merge branch '408-arbeit-am-ubersetzungstool' into 'development'

Resolve "Arbeit am Übersetzungstool"

Closes #408

See merge request !904

parents 01b4b9bc 9d44da27

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/LanguageController.php 102 additions, 15 deletions

app/Http/Controllers/LanguageController.php
app/Http/Controllers/MailController.php 173 additions, 10 deletions

app/Http/Controllers/MailController.php
app/Models/LanguageObject.php 42 additions, 0 deletions

app/Models/LanguageObject.php
public/langfiles.zip 0 additions, 0 deletions

public/langfiles.zip
resources/lang/de/languages.php 1 addition, 0 deletions

resources/lang/de/languages.php
resources/lang/en/languages.php 2 additions, 1 deletion

resources/lang/en/languages.php
resources/views/languages/edit.blade.php 2 additions, 2 deletions

resources/views/languages/edit.blade.php
resources/views/languages/synoptic.blade.php 59 additions, 0 deletions

resources/views/languages/synoptic.blade.php
routes/web.php 2 additions, 0 deletions

routes/web.php
synoptic 336 additions, 0 deletions

synoptic

with 719 additions and 28 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