a6ffea7016
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-31 13:20:57 +02:00
f29fe0180a
v0.10.18a - Various fixes
2020-08-31 13:20:49 +02:00
b6f4fdb138
v0.10.18 - When deleting a menu, guide or event - The news according to the menu,guide or event will also get deleted (correctly now)
2020-08-31 12:48:59 +02:00
0418805b7c
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/database/seeds/RoleSeeder.php
2020-08-31 09:38:20 +02:00
c6c54996b5
v0.10.16 - Various fixes
2020-08-31 09:36:10 +02:00
Neerholt
3856541790
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
...
Conflicts:
skolehjem/database/seeds/RoleSeeder.php
2020-08-31 09:16:04 +02:00
Neerholt
e36ddf78f8
v0.10.15r - Remove ExternalLink
2020-08-31 09:14:20 +02:00
d8a754d398
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-31 08:16:36 +02:00
08362b24cb
v0.10.15q - Various fixes
2020-08-31 08:16:26 +02:00
Neerholt
3235cea505
v0.10.15o - Permissions semi works
2020-08-28 08:28:32 +02:00
Neerholt
4beadfb223
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-27 15:30:26 +02:00
Neerholt
a766bfea95
v0.10.15l - Made role permissions semi done, sometimes it works sometimes it doesn't, it needs some touch up
2020-08-27 15:29:59 +02:00
78794074b2
v0.10.15k - Fixed admin access
2020-08-27 13:59:11 +02:00
Neerholt
a9608bdf3a
v0.10.15e - Administration can now changes a users profile images
2020-08-26 08:56:18 +02:00
0bd324e996
Merge remote-tracking branch 'origin/master'
2020-08-25 14:48:58 +02:00
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
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
5a1c1ee6fd
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-25 12:28:39 +02:00
725b34f6bf
v0.10.15 - Fixed EventController.php deletion of old events
2020-08-25 12:28:28 +02:00
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
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
5aebe1328d
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-19 10:01:38 +02:00
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
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
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
556f242595
v0.10.3a - Fixed: When deleting a location you now also delete the washing machines
2020-08-18 08:30:20 +02:00
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
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
5ac480454a
v0.10.0c - Fixed WashingMachine create & update AJAX
2020-08-17 11:07:26 +02:00
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
frederikpyt
Anders
Neerholt