34e123ee19
v0.10.17a - Various fixes
2020-08-31 11:56:05 +02:00
10bd0c021c
Merge remote-tracking branch 'origin/master'
2020-08-31 10:57:31 +02:00
7b157fcd90
v0.10.17 - Added permission check (create/edit/delete) on all admin sites
2020-08-31 10:57:26 +02:00
59bd705d89
v0.10.16a - Various fixes
2020-08-31 10:15:12 +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
1dafdfe052
Merge remote-tracking branch 'origin/master'
2020-08-28 12:54:49 +02:00
c86b8eba03
v0.10.15p - Fixed 'msg.telefontid'
2020-08-28 12:54:39 +02:00
Neerholt
7d4bd47ab8
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-28 08:28:44 +02:00
Neerholt
3235cea505
v0.10.15o - Permissions semi works
2020-08-28 08:28:32 +02:00
e0af87ba97
v0.10.15n - Added a functional Full Control button to roles.create
2020-08-28 08:26:32 +02:00
Neerholt
b6d819e5f8
v0.10.15m - added the last value to roles permissions
2020-08-27 16:40:46 +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
033d8f7c15
v0.10.15j - Fixed admin access
2020-08-27 12:46:07 +02:00
fc91a2f06b
v0.10.15i - Fixed admin access
2020-08-27 11:12:43 +02:00
c0669d6eda
v0.10.15h - Fixed admin access
2020-08-27 10:59:19 +02:00
Neerholt
5766770a4b
v0.10.15g - Added roles permissions selection, semi done
2020-08-27 10:20:48 +02:00
7b2d6fcf60
Merge remote-tracking branch 'origin/master'
2020-08-26 10:49:19 +02:00
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
Neerholt
a9608bdf3a
v0.10.15e - Administration can now changes a users profile images
2020-08-26 08:56:18 +02:00
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
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
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
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
0c8791683f
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-25 12:00:33 +02:00
Neerholt
fa606bd89f
v0.10.14h - Added tooltips to navbar
2020-08-25 12:00:10 +02:00
e1a2fd87f7
v0.14.14g - Fixed mails
2020-08-25 09:49:45 +02:00
Neerholt
f33b2bb45c
v0.10.14g - Fixed images error on washing machines
2020-08-25 09:25:42 +02:00
6569255d32
v0.14.14f - Fixed text in about.index
2020-08-25 08:15:25 +02:00
7cb88d8b58
Merge remote-tracking branch 'origin/master'
2020-08-24 14:25:56 +02:00
3e18809584
v0.10.14e - Location site now reloads with the div instead of the whole page
2020-08-24 14:25:50 +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
5c087c9b11
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 10:20:43 +02:00
Neerholt
5ebb8bc5a2
v0.10.14a - small css fix on event
2020-08-24 10:20:34 +02:00
9a1b6873d2
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
2020-08-24 10:17:15 +02:00
7a02f4a48f
v0.10.14 - Fixed localstorage saving for the admin menu and added ResourceCategorySeeder.php
2020-08-24 10:17:08 +02:00
Neerholt
e60c386b0e
v0.10.13c - Small css fix made to user search filter
2020-08-24 10:08:19 +02:00
frederikpyt
Anders
Neerholt