Merge remote-tracking branch 'origin/development' into 799-metager-in-docker (939a2d19) · 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

939a2d19

Commit 939a2d19 authored 6 years ago by Phil Höfer

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/development' into 799-metager-in-docker

parents d2c91461 eded8940

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

app/Http/Controllers/Assoziator.php 122 additions, 0 deletions

app/Http/Controllers/Assoziator.php
app/Http/Controllers/StartpageController.php 11 additions, 0 deletions

app/Http/Controllers/StartpageController.php
app/Http/Middleware/HumanVerification.php 2 additions, 1 deletion

app/Http/Middleware/HumanVerification.php
package-lock.json 35 additions, 12 deletions

package-lock.json
resources/assets/less/metager/general.less 2 additions, 2 deletions

resources/assets/less/metager/general.less
resources/lang/de/asso.php 8 additions, 0 deletions

resources/lang/de/asso.php
resources/lang/de/titles.php 1 addition, 0 deletions

resources/lang/de/titles.php
resources/views/assoziator/asso.blade.php 68 additions, 0 deletions

resources/views/assoziator/asso.blade.php
resources/views/index.blade.php 5 additions, 7 deletions

resources/views/index.blade.php
resources/views/parts/sidebar.blade.php 1 addition, 1 deletion

resources/views/parts/sidebar.blade.php
routes/web.php 7 additions, 0 deletions

routes/web.php
storage/app/public/stopwords.txt 1982 additions, 0 deletions

storage/app/public/stopwords.txt

with 2244 additions and 23 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