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 |