Commit Graph

910 Commits

Author SHA1 Message Date
Anders 0ab41524c6 Added an account page for admin site 2020-07-30 08:42:01 +02:00
frederikpyt 4a1002edf3 Added more svg icons to the hamburger menu 2020-07-30 08:41:09 +02:00
frederikpyt 9a6e1c4c4c Fixed bug 2020-07-30 08:20:30 +02:00
Anders 7f8b6a3222 Merge remote-tracking branch 'origin/master' 2020-07-29 15:28:28 +02:00
Anders d0c8adf7f4 Added store, update, edit to UserEventController.php 2020-07-29 15:28:21 +02:00
victor d5ee1a2146 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 15:27:18 +02:00
victor 4826725e07 Made washing-reservations search 2020-07-29 15:27:07 +02:00
Anders 0c5cb360f2 User can now remove themselves from an event - And get a success message after they've done so.
Removed user_id from washingReservation
2020-07-29 14:59:35 +02:00
frederikpyt d6fc1b63b0 Fixed bug 2020-07-29 14:50:09 +02:00
frederikpyt 30fb3b3cc0 Fixed bug 2020-07-29 14:36:11 +02:00
victor 0dd262d50c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 13:59:59 +02:00
frederikpyt 13c2e56e34 Filter search css 2020-07-29 13:58:19 +02:00
frederikpyt 657acbd6eb Added User on washing reservation show 2020-07-29 13:43:18 +02:00
victor a779b7325d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 13:33:20 +02:00
victor 7da57d5e18 Search 2020-07-29 13:33:11 +02:00
frederikpyt 579a34355d Fixed RoleSeeder.php 2020-07-29 13:28:25 +02:00
frederikpyt ef8d1626ec Fixed RoleSeeder.php 2020-07-29 13:21:51 +02:00
frederikpyt 556c0e1ba2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 12:30:12 +02:00
frederikpyt 9a1ca59e5b Permission fixes 2020-07-29 12:30:05 +02:00
Anders bc2323b915 Removed @extends("app.layout.header") from a few blade.php files in app 2020-07-29 12:25:36 +02:00
frederikpyt a5cb2e2cde Permission fixes 2020-07-29 12:18:08 +02:00
frederikpyt faec1f66c5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 11:53:46 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +02:00
victor 6a4cdbfb17 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-29 09:50:04 +02:00
victor 26c28d8e54 Made filter search 2020-07-29 09:49:54 +02:00
frederikpyt fc0f97b04e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 15:13:43 +02:00
frederikpyt b4f9065d79 Fixes 2020-07-28 15:13:33 +02:00
frederikpyt 606e13560b Washing Reservation create 2020-07-28 15:03:17 +02:00
Anders fd3f2de668 Merge remote-tracking branch 'origin/master' 2020-07-28 14:54:26 +02:00
Anders 556e6cf25a You are now able to remove people who have signed up for events - With routing etc. 2020-07-28 14:54:19 +02:00
frederikpyt fd2184c654 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/app/layout/base.blade.php
2020-07-28 14:30:37 +02:00
frederikpyt c4e4d64014 Washing Reservation dynamic content 2020-07-28 14:26:32 +02:00
victor 63f2cc31d9 Fix live search again 2020-07-28 14:23:54 +02:00
victor f6d762ba46 Revert "Added no match found on live search"
This reverts commit 47a07c61
2020-07-28 13:21:22 +02:00
victor a90c9aa8cd big smoke 2020-07-28 13:21:02 +02:00
victor 47a07c6174 Added no match found on live search 2020-07-28 11:31:39 +02:00
victor 2dba1fd8f7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 11:07:41 +02:00
victor c9cb3e99cd Jeg er ikke sikker 2020-07-28 11:07:33 +02:00
Anders cf533bb69f Merge remote-tracking branch 'origin/master' 2020-07-28 10:31:49 +02:00
Anders f9c11e67db Error and succes messages when you change password as user 2020-07-28 10:31:44 +02:00
Sebastian Davaris 22615b5f7d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 10:22:56 +02:00
Sebastian Davaris fbe72420dc Added RoleSeeder.php 2020-07-28 10:22:45 +02:00
Anders 8d8b5491c9 Removed unused/commented code 2020-07-28 10:17:00 +02:00
Anders 4d994d704b Merge remote-tracking branch 'origin/master' 2020-07-28 10:13:52 +02:00
Anders 80725dee12 Made it possible to sign up for events.
Added fail and success messages when signing up.
Fixed unique keys in migrate
2020-07-28 10:13:44 +02:00
victor 8cfca540f4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:37 +02:00
victor 9a5be4e280 Name fix for contact 2020-07-28 09:23:28 +02:00
frederikpyt e5e937b76c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:17 +02:00
frederikpyt 282ac8e735 Fixed washing reservation bugs 2020-07-28 09:21:41 +02:00
Anders dcc93ae40c Merge remote-tracking branch 'origin/master' 2020-07-28 08:44:32 +02:00