Commit Graph

392 Commits

Author SHA1 Message Date
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 bc847b38b0 v0.14.15 - Removed the first foreach in location show, and made an inner join instead, so it comes in correct order (by time), instead of by time and by machine id.
Added: The Reservations now gets deleted when time is past their washing time, as soon as you go onto your own reservations, the admin page for reservations or when the location show page reloads (every 1 minut)
2020-08-25 12:26:48 +02:00
Neerholt f33b2bb45c v0.10.14g - Fixed images error on washing machines 2020-08-25 09:25:42 +02:00
Neerholt abcc484e7c v0.10.14d - No can now see the users images on user admin 2020-08-24 14:09:03 +02:00
Neerholt fa5cd1c3e2 v0.10.14c - Various fixes 2020-08-24 11:27:17 +02:00
Neerholt 6b3af7e667 v0.10.14b - We now delete events from the database if the event passes the event data 2020-08-24 10:43:24 +02:00
Neerholt 5ebb8bc5a2 v0.10.14a - small css fix on event 2020-08-24 10:20:34 +02:00
Neerholt 137d878748 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 10:01:26 +02:00
Neerholt c2ddfcf346 v0.10.13b - Fixed images error after you had searched 2020-08-24 10:01:18 +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
Neerholt 522cf9cdf7 v0.10.12a - Made filter for washing machines done 2020-08-21 10:54:00 +02:00
Neerholt 89276c5af1 v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs 2020-08-20 14:59:22 +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 abd9ebbe3e v0.10.7 - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:47:39 +02:00
Neerholt d2441250fb v0.10.5c - Made menuplan pdf better 2020-08-18 15:27:58 +02:00
Neerholt 70437aaffa Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-18 12:33:12 +02:00
Neerholt d851354086 v0.10.5 - Added middelware 2020-08-18 12:33:04 +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
Anders 556f242595 v0.10.3a - Fixed: When deleting a location you now also delete the washing machines 2020-08-18 08:30:20 +02:00
Anders e6e0e3c95d v0.10.2 - Full functioning AJAX check submit code on User controller create & edit
- Plus all other pages where you create or update something of an unique value
2020-08-18 08:16:25 +02:00
Anders d19b9c1d1a v0.10.1a - Added AJAX check on update WashingMachine
Added AJAX check on create (missing on update) UserController - Only checks when submitting
2020-08-17 15:10:44 +02:00
Neerholt 0144fb8586 v0.10.0h - Fixed phone number bug, changed phone number from int to string 2020-08-17 14:42:58 +02:00
Neerholt 8bba60fa5a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 12:24:49 +02:00
Neerholt 9db169aadb v0.10.0d - Rolled back menuplan to old system layout and functionality 2020-08-17 12:24:43 +02:00
Anders 5ac480454a v0.10.0c - Fixed WashingMachine create & update AJAX 2020-08-17 11:07:26 +02:00
Anders 3bde377caa v0.10.0b - Fixed Location update AJAX
Added - You are now able to delete a location
2020-08-17 10:43:52 +02:00
Neerholt 773655c294 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 10:31:41 +02:00
Neerholt fe9eb4fd4d v0.10.0a - Added last support for NameCheck 2020-08-17 10:31:33 +02:00
Anders e6f03ad72b v0.9.15h - NameCheck - Fixed Updates 2020-08-17 10:21:02 +02:00
Neerholt 5f516992d7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 09:21:57 +02:00
Neerholt ea623a72ca v0.9.15g - NameCheck 2020-08-17 09:21:47 +02:00
Anders 4358f272ed Merge remote-tracking branch 'origin/master' 2020-08-17 08:26:08 +02:00
Anders 4b44f24be4 v0.9.15f - Fixed Feedback backend 2020-08-17 08:26:01 +02:00
Neerholt fce970de65 v0.9.15e - made nameCheck for guides 2020-08-17 08:23:48 +02:00
frederikpyt 604d5dad19 v0.9.15d - Fixed bug 2020-08-14 12:10:18 +02:00
frederikpyt 7dfcc36d07 v0.9.15c - Delete news when you delete its guide 2020-08-14 12:07:18 +02:00
frederikpyt dccc084dee Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-14 11:22:25 +02:00
Neerholt a4509fa412 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-14 11:22:59 +02:00
Neerholt 8a71d1d5ae v0.9.15a - optimized nameCheck 2020-08-14 11:22:51 +02:00
frederikpyt 051aceb041 v0.9.15b - Updated the menuplan pdf design 2020-08-14 11:22:18 +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
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
victor 8bfcfb6441 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-13 14:41:19 +02:00