Neerholt
201e2b5b35
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-09-10 10:39:16 +02:00
Neerholt
e08a8aa509
v1.1.0 - Washing machines and locations is on the same pages now, made bruger roles immortal so you cant delete it or edit it
2020-09-10 10:39:07 +02:00
Anders
e483400d82
v1.1.0 - Users can now sign up (Automatically gets 'Bruger' role)
2020-09-10 10:25:27 +02:00
Anders
5d82e7251b
v1.0.0a - Edited CSS & Controller img's
2020-09-09 09:15:17 +02:00
frederikpyt
6c4fceb697
v0.12.3 - Fixed reset password and email charset
2020-09-08 08:48:30 +02:00
Anders
66762efb8a
v0.12.2 - Added feedback storing to ajax instead of backend
2020-09-07 14:21:59 +02:00
Anders
d4ac70de70
v0.12.0 - Fixed pagination
...
Fixed RolesController.php - Changes "User" to "Bruger"
Added æøåÆØÅ to roles pattern
Fixed bugs/mistakes
2020-09-07 12:44:24 +02:00
Neerholt
84f5c51c48
v0.11.2b - Made a support user account
2020-09-07 08:28:49 +02:00
Neerholt
b62582e039
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-09-03 08:31:42 +02:00
Neerholt
ed51bb99fa
v0.11.2a - Fixed pagination, made a create user
2020-09-03 08:31:31 +02:00
Anders
821428c150
v0.11.1d - Fixed WashingReservation
2020-09-02 13:15:11 +02:00
frederikpyt
4a64d49902
v0.11.1 - Fixed roles and permissions
2020-09-02 11:40:36 +02:00
Anders
d7bfdaebf6
v0.11.0 - You can now edit roles
...
Fixed minor details
2020-09-02 08:56:02 +02:00
Anders
ca855f3349
v0.10.20d - Fixed RootController.php
2020-08-31 15:26:25 +02:00
Anders
9b26e5f1af
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# skolehjem/app/Http/Controllers/RootController.php
# skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:35:03 +02:00
Anders
cf1baac983
v0.10.20a - Changed type_id to type on news.index, so it's no longer a number
2020-08-31 14:31:56 +02:00
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
a6ffea7016
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-31 13:20:57 +02:00
frederikpyt
f29fe0180a
v0.10.18a - Various fixes
2020-08-31 13:20:49 +02:00
Anders
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
frederikpyt
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
frederikpyt
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
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
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
frederikpyt
78794074b2
v0.10.15k - Fixed admin access
2020-08-27 13:59:11 +02:00
frederikpyt
033d8f7c15
v0.10.15j - Fixed admin access
2020-08-27 12:46:07 +02:00
frederikpyt
fc91a2f06b
v0.10.15i - Fixed admin access
2020-08-27 11:12:43 +02:00
frederikpyt
c0669d6eda
v0.10.15h - Fixed admin access
2020-08-27 10:59:19 +02:00
Neerholt
a9608bdf3a
v0.10.15e - Administration can now changes a users profile images
2020-08-26 08:56:18 +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
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
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