 Neerholt
|
2b69938251
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:43:24 +02:00 |
|
Neerholt
|
7b4610f02f
|
Fix
|
2020-07-01 09:43:11 +02:00 |
frederikpyt
|
6b294972e4
|
Fixed admin dashboard current user label
|
2020-07-01 09:39:10 +02:00 |
|
frederikpyt
|
ff54108201
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:28:03 +02:00 |
|
frederikpyt
|
47daff173c
|
Added "no role" option when updating and creating a user
|
2020-07-01 09:27:54 +02:00 |
|
frederikpyt
|
f0a203fbb2
|
Rearranged admin panel site navigation
|
2020-07-01 09:27:18 +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
|
ec2479f0b4
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:40:54 +02:00 |
|
Anders
|
faa865c50f
|
fixed
|
2020-06-30 14:40:46 +02:00 |
|
frederikpyt
|
c505738592
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 14:09:19 +02:00 |
|
frederikpyt
|
3aee5515b1
|
Added confirmation to row deletion
|
2020-06-30 14:09:11 +02:00 |
|
Anders
|
8d7a684b93
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:04:41 +02:00 |
|
Anders
|
709be5ea87
|
Added account edit and route to it
|
2020-06-30 14:04:34 +02:00 |
|
frederikpyt
|
9f8cf52008
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 13:22:10 +02:00 |
|
frederikpyt
|
9425f5e067
|
Fixed role implementation on user index
|
2020-06-30 13:22:02 +02:00 |
|
Anders
|
56880d31be
|
Log out button for users added
|
2020-06-30 13:03:41 +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 |
|
frederikpyt
|
2ab54da383
|
Fix
|
2020-06-30 12:13:49 +02:00 |
|
frederikpyt
|
c49080f366
|
Dynamic roles in user create/edit frontend
|
2020-06-30 12:07:38 +02:00 |
|
frederikpyt
|
b586eceea9
|
Fix
|
2020-06-30 12:01:25 +02:00 |
|
frederikpyt
|
cab97f1c0a
|
Fix
|
2020-06-30 11:58:00 +02:00 |
|
frederikpyt
|
778315ff0b
|
Fix
|
2020-06-30 11:56:31 +02:00 |
|
frederikpyt
|
4b4b2b68de
|
Fix
|
2020-06-30 11:54:17 +02:00 |
|
frederikpyt
|
27414ade79
|
Role implementation
|
2020-06-30 11:49:17 +02:00 |
|
frederikpyt
|
b08422c520
|
Various fixes
|
2020-06-30 11:38:28 +02:00 |
|
frederikpyt
|
df679536de
|
Role frontend
|
2020-06-30 11:31:12 +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 |
|
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
|
0491bc9b85
|
Fixed Last normal security.
|
2020-06-30 10:42:10 +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
|
358b218d23
|
Finished security middlewarez
|
2020-06-30 10:04:06 +02:00 |
|
Sebastian Davaris
|
620902d7d8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:53:44 +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 |
|
Sebastian Davaris
|
a91118a2b3
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:49: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 |
|
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 |
|
frederikpyt
|
c803d12299
|
Frontend support for role selection in user create, read and update.
|
2020-06-30 08:03:42 +02:00 |
|
frederikpyt
|
a4ff9a3590
|
Fixed calender CSS
|
2020-06-30 07:45:58 +02:00 |