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
abd9ebbe3e
v0.10.7 - Fixed washing_reservation creation on app, hopefully forever
2020-08-18 22:47:39 +02:00
b5fb505eaa
Merge pull request #3 from sebathefox/Multi-language
...
v.0.5.8 - Multi language
2020-08-07 08:53:29 +02:00
Neerholt
7cc871ae90
v0.5.7 - Made multi language option
2020-08-06 15:31:38 +02:00
4b0ad949ba
v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations.
2020-08-06 10:32:34 +02:00
5452711665
v0.5.3 - Added Locations and a location_id to washing machines
2020-08-06 08:37:16 +02:00
ee3caae76a
Fixes
2020-08-05 09:15:50 +02:00
64d1f785f9
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
...
Conflicts:
skolehjem/app/Http/Controllers/WashingReservationController.php
2020-08-04 16:52:42 +02:00
50d8079da2
fixes
2020-08-04 15:29:21 +02:00
Neerholt
4f1ff3a823
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-04 15:29:18 +02:00
Neerholt
9dd09f2205
Made it so they can now make there own dynamic guide
2020-08-04 15:29:08 +02:00
d15f406059
Fail message when making a reservation with taken machine and time
2020-08-04 15:09:10 +02:00
0e9c054a12
Fix
2020-08-03 14:27:40 +02:00
898228637c
Fix
2020-08-03 14:26:58 +02:00
093a944980
Fix
2020-08-03 13:50:27 +02:00
a66b7aad92
Fixes
2020-08-03 12:57:14 +02:00
11e3958f0a
Added - orderBy to own events & own reservations
...
Fixed - confirm message when deleting events
2020-08-03 11:17:36 +02:00
Neerholt
62d73d0894
Vaskemaskine search er kogt
2020-07-30 09:17:27 +02:00
victor
d5ee1a2146
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
2020-07-29 15:27:18 +02:00
victor
4826725e07
Made washing-reservations search
2020-07-29 15:27:07 +02:00
0c5cb360f2
User can now remove themselves from an event - And get a success message after they've done so.
...
Removed user_id from washingReservation
2020-07-29 14:59:35 +02:00
569ace008a
Permission fixes and washing reservation fixes
2020-07-29 11:53:37 +02:00
c4e4d64014
Washing Reservation dynamic content
2020-07-28 14:26:32 +02:00
282ac8e735
Fixed washing reservation bugs
2020-07-28 09:21:41 +02:00
6eb198011f
Fixed redirect
2020-07-02 10:06:17 +02:00
330b895a35
Fixed redirect
2020-07-01 11:56:44 +02:00
cd828725b6
Fixed redirect
2020-07-01 11:54:33 +02:00
9d757dc536
Fixed washing machine reservation, creation, edit and deletion
2020-07-01 11:38:09 +02:00
Sebastian Davaris
358b218d23
Finished security middlewarez
2020-06-30 10:04:06 +02:00
a77b266999
Removed:
...
BookingController.php, Booking.php - Was already made being called washing-reservation
Route in web.php (Bookings not needed)
Fixed:
WashingReservationController.php
admin->layout->base (washing-reservations instead of booking)
2020-06-25 13:28:51 +02:00
Sebastian Davaris
79af2dee20
Fixed Controller dependencies.
2020-06-24 08:23:15 +02:00
dbe6a4dcfe
changed return view to Response::detect on controllers
2020-06-23 08:15:44 +02:00
Sebastian Davaris
07405d575d
Added more routes.
2020-06-15 08:59:15 +02:00
7eaa3311cb
Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts.
2020-06-09 09:05:07 +02:00
Anders
frederikpyt
Neerholt
Neerholt
Sebastian Davaris
Vedde