Commit Graph

1001 Commits

Author SHA1 Message Date
Anders 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
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 5766770a4b v0.10.15g - Added roles permissions selection, semi done 2020-08-27 10:20:48 +02:00
Anders 7b2d6fcf60 Merge remote-tracking branch 'origin/master' 2020-08-26 10:49:19 +02:00
Anders 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
Anders 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
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
frederikpyt 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
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 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
Anders 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
Anders 6569255d32 v0.14.14f - Fixed text in about.index 2020-08-25 08:15:25 +02:00
Anders 7cb88d8b58 Merge remote-tracking branch 'origin/master' 2020-08-24 14:25:56 +02:00
Anders 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
frederikpyt 9a1b6873d2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 10:17:15 +02:00
frederikpyt 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
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 7719b4b77b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 09:05:25 +02:00
Anders 556821ec8f Merge remote-tracking branch 'origin/master' 2020-08-24 09:00:27 +02:00
Anders 43893ab8ed v0.10.13 - Fixed: You can't see an event, if it's one day over time
Removed search bar from events
Added: You can't click on sites you're already on at the admin panel
2020-08-24 09:00:21 +02:00
Neerholt 679d5a0c3e v0.10.12a - Feedback fix 2020-08-24 09:00:15 +02:00
frederikpyt d280f6c7bc v0.10.12b - Fixed localstorage saving for the admin menu 2020-08-24 08:59:50 +02:00
macuser ba94e32ce2 Merge remote-tracking branch 'refs/remotes/origin/master' 2020-08-21 14:19:47 +02:00
macuser 0c39a9e485 updated app 2020-08-21 14:19:27 +02:00
macuser 4dc26fd229 Added iOS app 2020-08-21 14:18:39 +02:00
Frederik Milling Pytlick 6d551b42d0
Update base.blade.php 2020-08-21 13:44:33 +02:00
Sebastian D 6e277e9e79
Update base.blade.php 2020-08-21 13:41:06 +02:00
Sebastian D 78f97cbe9f
Create normalize.css 2020-08-21 13:39:45 +02:00