Commit Graph

236 Commits

Author SHA1 Message Date
Neerholt efb2840ff0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/RootController.php
2020-08-31 14:29:24 +02:00
Neerholt 20aa9c52af v0.10.20 - Made some small design changes to home pages 2020-08-31 14:28:15 +02:00
Anders bccd00683f v0.10.19 - Added building name to reservation site
Fixed $eventsToDelete in EventController.php
2020-08-31 14:04:02 +02:00
frederikpyt 34e123ee19 v0.10.17a - Various fixes 2020-08-31 11:56:05 +02:00
frederikpyt 59bd705d89 v0.10.16a - Various fixes 2020-08-31 10:15:12 +02:00
frederikpyt c6c54996b5 v0.10.16 - Various fixes 2020-08-31 09:36:10 +02:00
frederikpyt d8a754d398 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 08:16:36 +02:00
frederikpyt 08362b24cb v0.10.15q - Various fixes 2020-08-31 08:16:26 +02:00
Anders b72ca3fbde v0.10.15f - Added video to guides (Still in need of <iframe></iframe> to be removed on news site) 2020-08-26 10:49:11 +02:00
Anders f33cf609da v0.10.15d - Changed remember password to remember me
Added pattern to user edit on admin site
2020-08-25 15:08:54 +02:00
Anders 0bd324e996 Merge remote-tracking branch 'origin/master' 2020-08-25 14:48:58 +02:00
Anders 3b6b20f934 v0.10.15c - Changed error message when changing password (removed quotes). Added placeholder to email & phone number + added pattern to phone number 2020-08-25 14:48:52 +02:00
frederikpyt c1972e70c8 v0.10.15b - Fixed scroll 2020-08-25 14:16:47 +02:00
Neerholt f5e3e0c6e0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-25 14:07:29 +02:00
Neerholt e758a3ddac v0.10.15a - Added hide Menu on Scroll 2020-08-25 14:07:20 +02:00
frederikpyt 5a1c1ee6fd Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-25 12:28:39 +02:00
frederikpyt 725b34f6bf v0.10.15 - Fixed EventController.php deletion of old events 2020-08-25 12:28:28 +02:00
Anders e1a2fd87f7 v0.14.14g - Fixed mails 2020-08-25 09:49:45 +02:00
Anders 6569255d32 v0.14.14f - Fixed text in about.index 2020-08-25 08:15:25 +02:00
Neerholt fa5cd1c3e2 v0.10.14c - Various fixes 2020-08-24 11:27:17 +02:00
Anders 0655611a77 v0.10.13a - Fixed feedback so date can be seen - Fixed about page 2020-08-24 09:55:20 +02:00
Frederik Milling Pytlick 6d551b42d0
Update base.blade.php 2020-08-21 13:44:33 +02:00
Anders a145c88e2c v0.10.10f - You can no longer see your own reservations if they're an hour past due (Samt with admin) 2020-08-20 12:18:30 +02:00
frederikpyt cca543bf4a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 14:59:20 +02:00
frederikpyt 41af387399 v0.10.10c - Not done 2020-08-19 14:59:13 +02:00
Neerholt ec4fdca414 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 10:44:07 +02:00
Neerholt a8fc584304 v0.10.10b - Added small fixs to pagination 2020-08-19 10:43:59 +02:00
frederikpyt 5aebe1328d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 10:01:38 +02:00
frederikpyt 7e9277bd21 v0.10.10 - Fixed it so you can only upload image resources when uploading your profile picture 2020-08-19 10:01:22 +02:00
Neerholt 2f003600c5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 09:54:31 +02:00
Neerholt 6934c2d992 v0.10.9 - Added pagination onto guides, washing-reservations, events and news 2020-08-19 09:54:26 +02:00
frederikpyt 2430a6a381 v0.10.7b - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:55:50 +02:00
frederikpyt abd9ebbe3e v0.10.7 - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:47:39 +02:00
Anders ddbc3b8b60 v0.10.5 - Fixed vagttelefon
Added: Washing Machines & their reservations now delete when the location gets removed
2020-08-18 12:25:32 +02:00
frederikpyt d49a896fc0 v0.10.4 - Downloaded moment-js 2020-08-18 11:54:26 +02:00
frederikpyt 088fcd7f39 v0.10.3c - Fixed dark mode css 2020-08-18 09:02:03 +02:00
frederikpyt 44ade93240 v0.10.3 - Fixed darkmode css on app/washing-reservations/create.blade.php. Fixed frontend file upload valdiation. Fixed analytics 2020-08-18 08:19:14 +02:00
Neerholt 9db169aadb v0.10.0d - Rolled back menuplan to old system layout and functionality 2020-08-17 12:24:43 +02:00
frederikpyt 9596a426fa v0.10.0 - Added admin dashboard 2020-08-17 10:28:54 +02:00
Anders 45d1906497 v0.9.14 - Made an `Do you want email` slider on settings site 2020-08-14 10:17:52 +02:00
Neerholt c37645fe85 v0.9.13b - Made your event taben look better 2020-08-14 09:03:15 +02:00
frederikpyt 55eed84b86 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/EventController.php
2020-08-14 07:39:27 +02:00
frederikpyt 9e0f449bd3 v0.9.13 - Added notifications in events, when an event you're signed up to gets canceled. 2020-08-14 07:36:42 +02:00
Anders 9232ed99a1 v0.9.12 - Fixed CSS - Started working on wants_email button in account 2020-08-13 15:28:20 +02:00
frederikpyt 0e266c2583 v0.9.8 - Fixed participate/stop participating, so that you no longer hard refresh 2020-08-13 11:39:10 +02:00
frederikpyt 1f1ea3c832 v0.9.7 - Edited about 2020-08-13 10:26:43 +02:00
Anders 0300a6a76b v0.9.4 - Added remove function to feedback admin page
Added - You can now see if you're participating an event on event.index and yourevents.blade.php
Fixed `Tilbage` buttons
2020-08-13 09:08:34 +02:00
Anders 2cbb517ef1 v0.9.0 - Added individual `Read more` buttons on news.index
Added NewsType - To see if it's a news, menu, guide or event
Added type column to News type_id & arrangement_id (Both needed to see what type (menu,guide,news,event) and arrangement(The individual types ID))
Added NewsTypeSeeder.php
Fixed CSS
Added & Fixed messages en/dk
Fixed Editors
Added routing when removing yourself from an event, on events.index
2020-08-12 15:17:48 +02:00
frederikpyt e06504b5fb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/resources/lang/dk/msg.php
	skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
frederikpyt 4a8b22d6dd v0.8.5 - Fixed lang and css 2020-08-12 13:09:47 +02:00