Commit Graph

136 Commits

Author SHA1 Message Date
Anders 121476de60 Fixed title 2020-08-05 11:14:30 +02:00
Anders 21f3832564 Fixed title 2020-08-05 11:11:45 +02:00
Neerholt 5fa22d748a phone number and admin name 2020-08-05 10:22:10 +02:00
frederikpyt 0539e5c666 Created seeder for contacts 2020-08-05 09:43:39 +02:00
Anders a78e7d90f6 Fixed - Guides
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
Anders 0e72166ac4 Removed External Links 2020-08-04 15:20:56 +02:00
frederikpyt 2a3a728fa3 fixes 2020-08-04 14:27:11 +02:00
frederikpyt 9d52e2e621 fixes 2020-08-04 14:23:07 +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 9ed3faedfe fixed table name guideArticles -> guide_articles 2020-08-04 13:35:16 +02:00
Neerholt c223cb967c Made it so they can now make there own dynamic guide 2020-08-04 13:21:23 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
frederikpyt 27fd564e9f Fixed permissions, seeders and security 2020-08-03 08:33:11 +02:00
frederikpyt 6a3068c95c Fixed bugs 2020-07-30 14:51:43 +02:00
frederikpyt 991db2bab0 Fixed bugs 2020-07-30 14:51:23 +02:00
frederikpyt 6f11313362 Updated Seeders 2020-07-30 14:43:14 +02:00
frederikpyt 264c44529a Updated Seeders 2020-07-30 14:38:32 +02:00
frederikpyt be575a9515 Updated Seeders 2020-07-30 12:28:05 +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 9a1ca59e5b Permission fixes 2020-07-29 12:30:05 +02:00
frederikpyt a5cb2e2cde Permission fixes 2020-07-29 12:18:08 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +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 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
Vedran Zelen 67ae7746a3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 08:34:58 +02:00
Vedran Zelen b89c1509fe Added comments for easier understanding. 2020-07-28 08:34:10 +02:00
Sebastian Davaris fb65c1b9fc Added UserEvent.php 2020-07-28 08:18:45 +02:00
Neerholt 519bd70ace
Merge branch 'master' into LiveSearch 2020-07-27 14:23:13 +02:00
frederikpyt 4eaf3de6d5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 13:35:15 +02:00
frederikpyt 0c8cad9668 Fixed contacts 2020-07-27 13:34:45 +02:00
Anders a59c36ab1a Merge remote-tracking branch 'origin/master' 2020-07-27 13:09:56 +02:00
victor 2dd20ac85a Semi fix live search 2020-07-27 13:07:19 +02:00
Vedran Zelen 4558e8d958 added more comments
removed silly debug.
2020-07-27 12:40:45 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Sebastian Davaris 010322b605 Fixed frontend fuckup #3 2020-07-27 10:20:29 +02:00
Sebastian Davaris 79e5e95695 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/public/css/admin.css
2020-07-27 08:25:42 +02:00
Sebastian Davaris a755fd9680 Working on ResourceController.php again.. 2020-07-27 08:24:16 +02:00
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
Vedde cb927b9637 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/routes/web.php
2020-07-01 09:13:43 +02:00
Vedde 54a0fd0997 Added resource category migration and empty blade files 2020-07-01 09:08:33 +02:00
Anders dfd8420270 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Neerholt 3fe0b1e6e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:30:21 +02:00
Neerholt 6c020e36da Made role controller, added index and create 2020-06-30 11:30:12 +02:00
Vedde f0132bee2c worked on ResourceExtensionController.php and added resource_extension migration 2020-06-30 11:27:39 +02:00
Sebastian Davaris c1627c2fa4 Fixed UserSeeder.php. 2020-06-30 10:55:58 +02:00
Sebastian Davaris 7f91e76d90 Fixed UserSeeder.php. 2020-06-30 10:09:31 +02:00
Vedde 0dcc5ab6e8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 09:33:33 +02:00
Vedde c8327871a4 edited PermissionSeeder.php 2020-06-30 09:33:22 +02:00
frederikpyt 2814490a8a Merge remote-tracking branch 'origin/master' 2020-06-30 09:19:56 +02:00
frederikpyt af228f705d Removed unnecessary files 2020-06-30 09:19:35 +02:00
Vedde 2210bd9718 Merge x2 2020-06-30 08:56:19 +02:00
Vedde 139e62dedf Merge 2020-06-30 08:55:41 +02:00
Sebastian Davaris 620902d7d8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:53:44 +02:00
frederikpyt 8445a22732 Created files for gallery 2020-06-30 08:52:46 +02:00
Neerholt fd87e133e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:50:14 +02:00
Neerholt 20bfcb2c97 Made gallery, video, album, migrations 2020-06-30 08:50:04 +02:00
Sebastian Davaris c609cf78ff Added more permissions to the seeder. 2020-06-30 08:49:39 +02:00
Sebastian Davaris f638777878 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
	skolehjem/resources/views/admin/users/index.blade.php
2020-06-30 08:25:18 +02:00
Anders d6a9aa0c4f Merge remote-tracking branch 'origin/master' 2020-06-30 08:21:45 +02:00
Anders c732d8eec0 Fixed menuplan create 2020-06-30 08:21:36 +02:00
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Sebastian Davaris 988ceb7c8a Fixed error AND 0x01 2020-06-29 14:49:57 +02:00
Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
2020-06-29 14:48:53 +02:00
Sebastian Davaris eb749e58a5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:28:17 +02:00
Sebastian Davaris b5ede965fe Began working on security. 2020-06-29 14:28:09 +02:00
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00
Anders b942d8c1e1 Updated create_staff_table 2020-06-29 13:29:19 +02:00
Neerholt b48907b523 Made staff migrate 2020-06-29 13:27:48 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 7b691b8c94 added event migration 2020-06-29 12:54:43 +02:00
Neerholt ba73440044 Lavet sådan at man kan adde information til contacts databasen 2020-06-29 11:14:07 +02:00
Sebastian Davaris 0adc1ebf02 Added Contact-stuff 2020-06-29 08:50:50 +02:00
Neerholt 44e70232cd Kinda Tryna fix 2020-06-26 13:11:24 +02:00
Vedde 27b4f48af2 updated controller 2020-06-25 09:15:21 +02:00
Vedde 85989f5b04 added crud external-link blade and added menu plan 2020-06-23 11:59:26 +02:00
Vedde 643ac9e3de added values to migrations. 2020-06-10 12:29:18 +02:00
Vedde fa6fdcd690 Added a few models and migrations 2020-06-09 10:45:16 +02:00
Sebastian Davaris fbf1673fc0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-08 15:08:58 +02:00
Sebastian Davaris bd23d10a9d Added first seeder. 2020-06-08 15:08:46 +02:00
Vedde e2562f6960 added migrations of events, feedback, washing machines, and calendar events.
changed migration users table name into name first and name last.
added migration external link table string: name and link.
2020-06-08 14:59:25 +02:00
Vedde cb20b1f862 added feedback, external link and washing reservations migrations 2020-06-08 10:56:37 +02:00
Sebastian Davaris da00009fe9 Initial Commit 2020-06-08 10:04:45 +02:00