Anders
|
2368573ee7
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 11:44:20 +02:00 |
|
Anders
|
a174b47258
|
Fail message when there is no activity.
You can now use the button "Kontoret" in the menu navbar
|
2020-07-01 11:44:14 +02:00 |
frederikpyt
|
b84b9dbe04
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 11:41:08 +02:00 |
|
frederikpyt
|
9d757dc536
|
Fixed washing machine reservation, creation, edit and deletion
|
2020-07-01 11:38:09 +02:00 |
Vedde
|
32a7e3d3d0
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 11:29:58 +02:00 |
|
Vedde
|
9f48d2372f
|
added a few comments
|
2020-07-01 11:29:45 +02:00 |
|
Anders
|
9870556c5a
|
Now able to delete washing machines
|
2020-07-01 10:56:04 +02:00 |
|
frederikpyt
|
432d9042fd
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 10:32:52 +02:00 |
|
frederikpyt
|
2846dac2dc
|
Fixed Washing machine creation and editing
|
2020-07-01 10:30:28 +02:00 |
 Neerholt
|
32b7b3c925
|
Test commit
|
2020-07-01 10:29:47 +02:00 |
|
Anders
|
b4f79c6f5e
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 10:13:57 +02:00 |
|
Anders
|
03b7f4236a
|
Users able to change password
|
2020-07-01 10:13:49 +02:00 |
|
frederikpyt
|
6ecc96ef55
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:50:36 +02:00 |
|
Neerholt
|
eb48514545
|
Made it so you get send to index after you make,edit and update user information
|
2020-07-01 09:50:37 +02:00 |
|
frederikpyt
|
ca744a33e9
|
Removed feedback create button from admin dashboard
|
2020-07-01 09:50:29 +02:00 |
|
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 |
|
Neerholt
|
b929aa2bdb
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:17:14 +02:00 |
|
Neerholt
|
016613b469
|
Fix
|
2020-07-01 09:16:53 +02:00 |
|
Vedde
|
a1c73b0224
|
changed web.php to be correct
|
2020-07-01 09:15:11 +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 |
 Sebastian Davaris
|
903341c1ec
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 08:14:34 +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
|
5e60794c1a
|
Added account edit and route to it
|
2020-06-30 14:05:40 +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 |
|
Neerholt
|
ed9e6c9d6a
|
Slet roles
|
2020-06-30 13:30:01 +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 |
|
Sebastian Davaris
|
36995e4ca9
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 13:17:03 +02:00 |
|
Anders
|
56880d31be
|
Log out button for users added
|
2020-06-30 13:03:41 +02:00 |
|
Sebastian Davaris
|
73387686b5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 12:41:45 +02:00 |
|
Sebastian Davaris
|
9065d2043b
|
Fixed UserController.php...
|
2020-06-30 12:41:28 +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 |
|
Sebastian Davaris
|
52735bc569
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 12:22:44 +02:00 |
|
Sebastian Davaris
|
68876198ed
|
Working on ResourceController.php.
|
2020-06-30 12:22:35 +02:00 |
|
Neerholt
|
e3c7204961
|
Added roles to fillable
|
2020-06-30 12:21:05 +02:00 |
|
Neerholt
|
90ec2b9a68
|
Added roles to store
|
2020-06-30 12:17:47 +02:00 |
|
frederikpyt
|
2ab54da383
|
Fix
|
2020-06-30 12:13:49 +02:00 |
|
Neerholt
|
5bd37db3e2
|
Made it so roles data kev
|
2020-06-30 12:11:18 +02:00 |
|
Neerholt
|
1706e12cc8
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 12:09:17 +02:00 |