Commit Graph

285 Commits

Author SHA1 Message Date
Anders 02b6684030 Added - Deleting Washing Reservations when deleting a washing machine 2020-08-05 10:11:28 +02:00
Anders f988967c22 Guides - Fixed
Contact - Added phonetimes
2020-08-05 09:43:53 +02:00
Anders 91f7a4aa05 Merge remote-tracking branch 'origin/master' 2020-08-05 09:24:08 +02:00
Anders a78e7d90f6 Fixed - Guides
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
frederikpyt ee3caae76a Fixes 2020-08-05 09:15:50 +02:00
frederikpyt 072c5c65ab Fixes and todo's 2020-08-05 08:10:38 +02:00
frederikpyt 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
frederikpyt 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
Anders 0e72166ac4 Removed External Links 2020-08-04 15:20:56 +02:00
Anders d15f406059 Fail message when making a reservation with taken machine and time 2020-08-04 15:09:10 +02:00
frederikpyt 5973b94247 Merge remote-tracking branch 'origin/master' 2020-08-04 14:11:33 +02:00
frederikpyt 66f7e3b86b fixes 2020-08-04 14:11:05 +02:00
Anders c8b85a6c9b fixed guide_article 2020-08-04 13:37:06 +02:00
frederikpyt f5a0174939 Merge remote-tracking branch 'origin/master' 2020-08-04 13:23:42 +02:00
frederikpyt 694bd35b33 Implemented forgot password 2020-08-04 13:21:56 +02:00
Neerholt 210aa00fc6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-04 13:21:39 +02:00
Neerholt c223cb967c Made it so they can now make there own dynamic guide 2020-08-04 13:21:23 +02:00
frederikpyt d818d15b85 Implemented forgot password 2020-08-04 10:59:45 +02:00
Anders 9d44432fc2 Session message on fail - Menuplans 2020-08-04 10:11:18 +02:00
Anders 2edfd71de9 Session message on fail - Users / Roles / Events 2020-08-04 09:34:56 +02:00
Anders b59189eac0 Session message on fail - Washing machine 2020-08-04 08:31:14 +02:00
Anders f551d4c59f Changed session messages on fail or success 2020-08-04 08:04:54 +02:00
frederikpyt 0e9c054a12 Fix 2020-08-03 14:27:40 +02:00
frederikpyt 898228637c Fix 2020-08-03 14:26:58 +02:00
frederikpyt ae14081221 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-03 13:50:34 +02:00
frederikpyt 093a944980 Fix 2020-08-03 13:50:27 +02:00
Neerholt e8f6c2242a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-03 13:21:56 +02:00
Neerholt e2847e9959 Fixed PageNation 2020-08-03 13:21:47 +02:00
Neerholt 679de4872d fixed 2020-08-03 13:14:58 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
Anders 11e3958f0a Added - orderBy to own events & own reservations
Fixed - confirm message when deleting events
2020-08-03 11:17:36 +02:00
Anders 90b58a8586 Fixed - Redirect in Event controler
Fixed - orderBy function when searching, in Event & Feedback
2020-08-03 10:46:48 +02:00
Anders ffb347b51d Merge remote-tracking branch 'origin/master' 2020-08-03 10:37:04 +02:00
Anders b4263d8891 Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
2020-08-03 10:36:57 +02:00
Neerholt d7c4f2052b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/routes/web.php
2020-08-03 10:09:54 +02:00
Neerholt 84cd760b0f Made ris ros filter 2020-08-03 10:08:03 +02:00
frederikpyt 09fa8ce007 Fixed permissions 2020-08-03 09:39:32 +02:00
Anders 5f6546e399 Merge remote-tracking branch 'origin/master' 2020-08-03 08:54:35 +02:00
Anders 1d63879117 Added "orderBy" function to event and feedback. 2020-08-03 08:46:38 +02:00
frederikpyt f14dc22d92 Fixed permissions, seeders and security 2020-08-03 08:35:20 +02:00
frederikpyt 27fd564e9f Fixed permissions, seeders and security 2020-08-03 08:33:11 +02:00
Anders 1f5660001e Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
2020-07-31 11:14:24 +02:00
Anders 56cbe7ad41 Added success message when you change credentials
Added "see password" button - With CSS & Script (Script in file)
2020-07-31 09:28:58 +02:00
frederikpyt 38f8bfa0c9 Fixed bugs 2020-07-30 15:25:37 +02:00
frederikpyt ab12a46943 Fixed bugs 2020-07-30 14:52:40 +02:00
frederikpyt 264c44529a Updated Seeders 2020-07-30 14:38:32 +02:00
Neerholt 7830e31b21 Roles are now searchable 2020-07-30 11:02:41 +02:00
frederikpyt cf4559874a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 10:12:00 +02:00