Vedran Zelen
|
ce3c8e6459
|
added comment
|
2020-07-27 09:35:36 +02:00 |
frederikpyt
|
6eb198011f
|
Fixed redirect
|
2020-07-02 10:06:17 +02:00 |
|
frederikpyt
|
330b895a35
|
Fixed redirect
|
2020-07-01 11:56:44 +02:00 |
|
frederikpyt
|
cd828725b6
|
Fixed redirect
|
2020-07-01 11:54:33 +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 |
|
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 |
 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 |
|
Neerholt
|
7b4610f02f
|
Fix
|
2020-07-01 09:43:11 +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
|
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
|
faa865c50f
|
fixed
|
2020-06-30 14:40:46 +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 |
|
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
|
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 |
|
Neerholt
|
5bd37db3e2
|
Made it so roles data kev
|
2020-06-30 12:11:18 +02:00 |
|
Neerholt
|
f46062a9c4
|
Made it so roles data
|
2020-06-30 12:08:31 +02:00 |
|
Neerholt
|
05ec4e0228
|
Fixed idk kev
|
2020-06-30 12:02:32 +02:00 |
|
Neerholt
|
af6222df97
|
Fixed Store
|
2020-06-30 11:55:11 +02:00 |
|
Neerholt
|
e14ba7bdbd
|
Added s
|
2020-06-30 11:51:20 +02:00 |
|
Neerholt
|
c7c172c44b
|
Controller fix small R
|
2020-06-30 11:49:58 +02:00 |
|
frederikpyt
|
e0142bf977
|
Fixed deletion
|
2020-06-30 11:45:54 +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 |
|
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
|
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 |