Skip to content
Snippets Groups Projects
Commit c6cc206b authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master' 

adjust some settings

See merge request !245
parents 9f6069d8 e6392b35
1 merge request!245adjust some settings
Pipeline #27407 passed with stages
Stage:
    Stage:
      Stage:
        Stage:
          in 7 minutes and 56 seconds
          Hide whitespace changes
          Inline Side-by-side
          src/assets/config/config.dev.json
          + 2
          − 2
          View file @ c6cc206b
          ...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
          "env": { "env": {
          "name": "dev" "name": "dev"
          }, },
          "authentication": { "authentication": {
          "lecturer": { "lecturer": {
          "allowGuest": false "allowGuest": true
          }, },
          "student": { "student": {
          "allowGuest": true "allowGuest": true
          ......
          src/index.html
          + 3
          − 3
          View file @ c6cc206b
          ...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
          <head> <head>
          <meta charset="utf-8"> <meta charset="utf-8">
          <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
          <meta name="description" content="A responsive, interactive Audience Response System, developed at THM"> <meta name="description" content="A responsive, interactive Audience Response System developed at THM">
          <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=2.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=5.0">
          <title>ARSnova</title> <title>ARSnova</title>
          <base href="/"> <base href="/">
          ...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
          <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en"> <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en">
          <link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
          <meta name="theme-color" content="#fafafa"> <meta name="theme-color" content="#121212">
          </head> </head>
          <body> <body>
          <app-root></app-root> <app-root></app-root>
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment