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
|
c8b85a6c9b
|
fixed guide_article
|
2020-08-04 13:37:06 +02:00 |
|
frederikpyt
|
f5a0174939
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 13:23:42 +02:00 |
|
frederikpyt
|
694bd35b33
|
Implemented forgot password
|
2020-08-04 13:21:56 +02:00 |
 Neerholt
|
210aa00fc6
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-04 13:21:39 +02:00 |
|
Neerholt
|
c223cb967c
|
Made it so they can now make there own dynamic guide
|
2020-08-04 13:21:23 +02:00 |
|
frederikpyt
|
d818d15b85
|
Implemented forgot password
|
2020-08-04 10:59:45 +02:00 |
|
Anders
|
9d44432fc2
|
Session message on fail - Menuplans
|
2020-08-04 10:11:18 +02:00 |
|
Anders
|
2edfd71de9
|
Session message on fail - Users / Roles / Events
|
2020-08-04 09:34:56 +02:00 |
|
Anders
|
b59189eac0
|
Session message on fail - Washing machine
|
2020-08-04 08:31:14 +02:00 |
|
Anders
|
f551d4c59f
|
Changed session messages on fail or success
|
2020-08-04 08:04:54 +02:00 |
|
frederikpyt
|
0e9c054a12
|
Fix
|
2020-08-03 14:27:40 +02:00 |
|
frederikpyt
|
898228637c
|
Fix
|
2020-08-03 14:26:58 +02:00 |
|
frederikpyt
|
ae14081221
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 13:50:34 +02:00 |
|
frederikpyt
|
093a944980
|
Fix
|
2020-08-03 13:50:27 +02:00 |
|
Neerholt
|
e8f6c2242a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-03 13:21:56 +02:00 |
|
Neerholt
|
e2847e9959
|
Fixed PageNation
|
2020-08-03 13:21:47 +02:00 |
|
Neerholt
|
679de4872d
|
fixed
|
2020-08-03 13:14:58 +02:00 |
|
frederikpyt
|
a66b7aad92
|
Fixes
|
2020-08-03 12:57:14 +02:00 |
|
Anders
|
11e3958f0a
|
Added - orderBy to own events & own reservations
Fixed - confirm message when deleting events
|
2020-08-03 11:17:36 +02:00 |
|
Anders
|
90b58a8586
|
Fixed - Redirect in Event controler
Fixed - orderBy function when searching, in Event & Feedback
|
2020-08-03 10:46:48 +02:00 |
|
Anders
|
ffb347b51d
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 10:37:04 +02:00 |
|
Anders
|
b4263d8891
|
Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
|
2020-08-03 10:36:57 +02:00 |
|
Neerholt
|
d7c4f2052b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/routes/web.php
|
2020-08-03 10:09:54 +02:00 |
|
Neerholt
|
84cd760b0f
|
Made ris ros filter
|
2020-08-03 10:08:03 +02:00 |
|
frederikpyt
|
09fa8ce007
|
Fixed permissions
|
2020-08-03 09:39:32 +02:00 |
|
Anders
|
5f6546e399
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 08:54:35 +02:00 |
|
Anders
|
1d63879117
|
Added "orderBy" function to event and feedback.
|
2020-08-03 08:46:38 +02:00 |
|
frederikpyt
|
f14dc22d92
|
Fixed permissions, seeders and security
|
2020-08-03 08:35:20 +02:00 |
|
frederikpyt
|
27fd564e9f
|
Fixed permissions, seeders and security
|
2020-08-03 08:33:11 +02:00 |
|
Anders
|
1f5660001e
|
Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
|
2020-07-31 11:14:24 +02:00 |
|
Anders
|
56cbe7ad41
|
Added success message when you change credentials
Added "see password" button - With CSS & Script (Script in file)
|
2020-07-31 09:28:58 +02:00 |
|
frederikpyt
|
38f8bfa0c9
|
Fixed bugs
|
2020-07-30 15:25:37 +02:00 |
|
frederikpyt
|
ab12a46943
|
Fixed bugs
|
2020-07-30 14:52:40 +02:00 |
|
frederikpyt
|
264c44529a
|
Updated Seeders
|
2020-07-30 14:38:32 +02:00 |
|
Neerholt
|
7830e31b21
|
Roles are now searchable
|
2020-07-30 11:02:41 +02:00 |
|
frederikpyt
|
cf4559874a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 10:12:00 +02:00 |
|
Neerholt
|
62d73d0894
|
Vaskemaskine search er kogt
|
2020-07-30 09:17:27 +02:00 |
|
frederikpyt
|
9a6e1c4c4c
|
Fixed bug
|
2020-07-30 08:20:30 +02:00 |
|
Anders
|
7f8b6a3222
|
Merge remote-tracking branch 'origin/master'
|
2020-07-29 15:28:28 +02:00 |
|
Anders
|
d0c8adf7f4
|
Added store, update, edit to UserEventController.php
|
2020-07-29 15:28:21 +02:00 |
|
victor
|
d5ee1a2146
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 15:27:18 +02:00 |
|
victor
|
4826725e07
|
Made washing-reservations search
|
2020-07-29 15:27:07 +02:00 |
|
Anders
|
0c5cb360f2
|
User can now remove themselves from an event - And get a success message after they've done so.
Removed user_id from washingReservation
|
2020-07-29 14:59:35 +02:00 |
|
frederikpyt
|
d6fc1b63b0
|
Fixed bug
|
2020-07-29 14:50:09 +02:00 |
|
frederikpyt
|
30fb3b3cc0
|
Fixed bug
|
2020-07-29 14:36:11 +02:00 |
|
victor
|
a779b7325d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 13:33:20 +02:00 |
|
victor
|
7da57d5e18
|
Search
|
2020-07-29 13:33:11 +02:00 |
|
frederikpyt
|
9a1ca59e5b
|
Permission fixes
|
2020-07-29 12:30:05 +02:00 |