frederikpyt 4c2b58f33b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp ...

 Conflicts:

	skolehjem/resources/views/admin/events/create.blade.php

2020-08-07 09:49:31 +02:00

..

contacts

v0.5.1 - Made contact phone number optional and updated data in seeders.

2020-08-05 13:29:45 +02:00

events

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

2020-08-07 09:49:31 +02:00

feedbacks

Removes - Console.log in feedback(s)

2020-08-03 13:44:53 +02:00

guides

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

2020-08-07 09:49:31 +02:00

layout

v0.5.5 - Added news on the admin panel

2020-08-06 12:21:19 +02:00

locations

v0.5.4B - Fixed some css

2020-08-06 10:57:18 +02:00

menuplans

v0.5.2 - Made the new menuplan, so you now can use CKeditor.

2020-08-05 14:59:41 +02:00

news

v0.5.5 - Added news on the admin panel

2020-08-06 12:21:19 +02:00

resource-categories

Added resource category migration and empty blade files

2020-07-01 09:08:33 +02:00

resource-extensions

worked on ResourceExtensionController.php

2020-06-30 10:57:25 +02:00

roles

Fixes and todo's

2020-08-05 08:10:38 +02:00

root

Removed:

2020-06-25 13:28:51 +02:00

users

v0.5.6b - Added error messages when loggin in with wrong credentials, when changing password and when logging out - Admin & User

2020-08-07 08:35:23 +02:00

washing-machines

v0.5.3 - Added Locations and a location_id to washing machines

2020-08-06 08:37:16 +02:00

washing-reservations

Fixes and todo's

2020-08-05 08:10:38 +02:00

index.blade.php

Added admin sites

2020-06-15 08:56:21 +02:00