vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2021-04-19 09:12:01 +02:00
parent 40d082291f 5b06144ad1
commit 0563422aec
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/dataSources.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="SQLite - laravel.sqlite" uuid="095712fb-c818-450c-85ac-af2c7366a10f"> <data-source source="LOCAL" name="laravel.sqlite" uuid="f7be1ece-08dd-4ce3-8bc7-5dce0780cc96">
<driver-ref>sqlite.xerial</driver-ref> <driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize> <synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver> <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:C:\xampp\htdocs\skolehjem-webapp\skolehjem\database\laravel.sqlite</jdbc-url> <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/skolehjem/database/laravel.sqlite</jdbc-url>
<working-dir>$ProjectFileDir$</working-dir> <working-dir>$ProjectFileDir$</working-dir>
</data-source> </data-source>
</component> </component>

5
skolehjem/public/manifest.json
View File

@ -9,6 +9,11 @@
"theme_color": "#00788a", "theme_color": "#00788a",
"orientation": "portrait-primary", "orientation": "portrait-primary",
"icons": [ "icons": [
{
"src": "/images/icons/browserFavIcon.svg",
"type": "image/svg",
"sizes": "144X144"
},
{ {
"src": "/images/icons/img72x72.svg", "src": "/images/icons/img72x72.svg",
"type": "image/svg", "type": "image/svg",

1
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -96,7 +96,6 @@
$("#date").html(l.date); $("#date").html(l.date);
$("#accountable").html(l.accountable); $("#accountable").html(l.accountable);
$("#description").html(l.description); $("#description").html(l.description);
$("#f").html(l.resource_id);
}, },
error:function (data) { error:function (data) {
console.log(data); console.log(data);