frederikpyt
|
e0142bf977
|
Fixed deletion
|
2020-06-30 11:45:54 +02:00 |
|
frederikpyt
|
484641bdee
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 11:38:35 +02:00 |
|
frederikpyt
|
b08422c520
|
Various fixes
|
2020-06-30 11:38:28 +02:00 |
 Neerholt
|
2840b879ea
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 11:35:41 +02:00 |
|
Neerholt
|
7f8fa8004f
|
made the role controller done
|
2020-06-30 11:35:32 +02:00 |
|
frederikpyt
|
78756ab5f0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 11:31:21 +02:00 |
|
frederikpyt
|
df679536de
|
Role frontend
|
2020-06-30 11:31:12 +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 |
|
Vedde
|
8415338120
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:57:36 +02:00 |
|
Vedde
|
5b36a52320
|
worked on ResourceExtensionController.php
|
2020-06-30 10:57:25 +02:00 |
 Sebastian Davaris
|
bc862a2303
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:56:09 +02:00 |
|
Sebastian Davaris
|
c1627c2fa4
|
Fixed UserSeeder.php.
|
2020-06-30 10:55:58 +02:00 |
|
frederikpyt
|
b878e81822
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:46:56 +02:00 |
|
frederikpyt
|
2a63600135
|
Fixes
|
2020-06-30 10:46:49 +02:00 |
|
Sebastian Davaris
|
3cfcd980f4
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:42:19 +02:00 |
|
Sebastian Davaris
|
0491bc9b85
|
Fixed Last normal security.
|
2020-06-30 10:42:10 +02:00 |
|
frederikpyt
|
7c2d7f21d0
|
Fixes and implementation of forgot password
|
2020-06-30 10:35:09 +02:00 |
|
frederikpyt
|
aea1b0af04
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:19:08 +02:00 |
|
frederikpyt
|
c074f32bbe
|
Fixes and implementation of forgot password
|
2020-06-30 10:19:01 +02:00 |
|
Sebastian Davaris
|
7f91e76d90
|
Fixed UserSeeder.php.
|
2020-06-30 10:09:31 +02:00 |
|
Sebastian Davaris
|
2409fec66e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:04:16 +02:00 |
|
Sebastian Davaris
|
358b218d23
|
Finished security middlewarez
|
2020-06-30 10:04:06 +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 |
|
Sebastian Davaris
|
0a89d24319
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 09:21:33 +02:00 |
|
Sebastian Davaris
|
14b745dc2b
|
Added more permissions to the seeder..
|
2020-06-30 09:21:21 +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
|
c794a9e055
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:56:25 +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
|
ccc45f485c
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 08:52:59 +02:00 |
|
frederikpyt
|
8445a22732
|
Created files for gallery
|
2020-06-30 08:52:46 +02:00 |
|
Vedde
|
3b2fec0e09
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:52:20 +02:00 |
|
Vedde
|
66e8b2e3d8
|
Modified EventController.php.
|
2020-06-30 08:52:11 +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
|
a91118a2b3
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:49:51 +02:00 |
|
Sebastian Davaris
|
c609cf78ff
|
Added more permissions to the seeder.
|
2020-06-30 08:49:39 +02:00 |
|
frederikpyt
|
8e8a6c8d6b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:48:58 +02:00 |
|
frederikpyt
|
223ba6dc41
|
Created files for gallery
|
2020-06-30 08:48:51 +02:00 |
Anders
|
1cf39cbbd2
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 08:35:49 +02:00 |
|
Anders
|
d93fff517a
|
Users can now create a feedback to the admins (Needing a new way to see the message in the admin panel)
|
2020-06-30 08:35:40 +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 |
|
Sebastian Davaris
|
4a0840b104
|
Modified base.blade.php?
|
2020-06-30 08:24:29 +02:00 |
|
frederikpyt
|
2f22ae275e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:23:14 +02:00 |
|
frederikpyt
|
2562c69c36
|
Fixed delete on indexes
|
2020-06-30 08:23:07 +02:00 |