Anders
|
b59189eac0
|
Session message on fail - Washing machine
|
2020-08-04 08:31:14 +02:00 |
|
Anders
|
e8de894ae7
|
Merge remote-tracking branch 'origin/master'
|
2020-08-04 08:05:07 +02:00 |
|
Anders
|
f551d4c59f
|
Changed session messages on fail or success
|
2020-08-04 08:04:54 +02:00 |
frederikpyt
|
84a1045747
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 15:02:36 +02:00 |
|
frederikpyt
|
4fe015a74c
|
Fix
|
2020-08-03 15:02:26 +02:00 |
|
Anders
|
20d73c047f
|
Fixed date and stuff
|
2020-08-03 14:47:06 +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 |
|
Anders
|
01f9502653
|
Removes - Console.log in feedback(s)
|
2020-08-03 13:44:53 +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
|
7abfbe27b2
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 11:17:47 +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 |
|
frederikpyt
|
5ad6fb129b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 10:48:24 +02:00 |
|
frederikpyt
|
91f51d0689
|
Fixed css
|
2020-08-03 10:48:17 +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
|
93198e5a54
|
Fixed css
|
2020-08-03 09:53:57 +02:00 |
|
Anders
|
c2a90c69f9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/app/users/editpass.blade.php
|
2020-08-03 09:43:51 +02:00 |
|
Anders
|
f2895a00e3
|
Started working on a better see password button
|
2020-08-03 09:42:17 +02:00 |
|
frederikpyt
|
09fa8ce007
|
Fixed permissions
|
2020-08-03 09:39:32 +02:00 |
|
frederikpyt
|
52f71abdd5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-08-03 09:09:53 +02:00 |
|
frederikpyt
|
b0b2a7b4f0
|
Fixed css
|
2020-08-03 09:09:46 +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
|
073938a469
|
Fixed css
|
2020-08-03 08:45:45 +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
|
d8ff713b90
|
Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles
|
2020-07-31 10:38:10 +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
|
0e77da93b2
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 14:51:50 +02:00 |
|
frederikpyt
|
6a3068c95c
|
Fixed bugs
|
2020-07-30 14:51:43 +02:00 |
|
frederikpyt
|
991db2bab0
|
Fixed bugs
|
2020-07-30 14:51:23 +02:00 |
|
Anders
|
e599d09aa7
|
Correct route to feedbacks x2
|
2020-07-30 14:51:03 +02:00 |
|
Anders
|
986a62009d
|
Correct route to feedbacks
|
2020-07-30 14:47:22 +02:00 |
|
frederikpyt
|
6f11313362
|
Updated Seeders
|
2020-07-30 14:43:14 +02:00 |
|
frederikpyt
|
264c44529a
|
Updated Seeders
|
2020-07-30 14:38:32 +02:00 |
|
frederikpyt
|
666e8cb7f3
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 12:28:11 +02:00 |
|
frederikpyt
|
be575a9515
|
Updated Seeders
|
2020-07-30 12:28:05 +02:00 |
|
Anders
|
f4ba4f6c45
|
Edited text
|
2020-07-30 12:20:52 +02:00 |
|
Neerholt
|
bad88a5e51
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 11:03:11 +02:00 |
|
Neerholt
|
7830e31b21
|
Roles are now searchable
|
2020-07-30 11:02:41 +02:00 |
|
Anders
|
b4f3be91e2
|
Link on front page are now centered
|
2020-07-30 10:34:00 +02:00 |
|
Anders
|
f36f460b14
|
Front Page now has all useable buttons and links.
Added "Are you sure" when you unsubscribe from an event
|
2020-07-30 10:31:04 +02:00 |
|
frederikpyt
|
cf4559874a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 10:12:00 +02:00 |
|
frederikpyt
|
06346d9675
|
Fixed css and created the washing reservation index for app
|
2020-07-30 10:11:52 +02:00 |
|
Neerholt
|
84b71731d9
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 09:17:37 +02:00 |
|
Neerholt
|
62d73d0894
|
Vaskemaskine search er kogt
|
2020-07-30 09:17:27 +02:00 |
|
Anders
|
0ab41524c6
|
Added an account page for admin site
|
2020-07-30 08:42:01 +02:00 |
|
frederikpyt
|
4a1002edf3
|
Added more svg icons to the hamburger menu
|
2020-07-30 08:41:09 +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
|
0dd262d50c
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 13:59:59 +02:00 |
|
frederikpyt
|
13c2e56e34
|
Filter search css
|
2020-07-29 13:58:19 +02:00 |
|
frederikpyt
|
657acbd6eb
|
Added User on washing reservation show
|
2020-07-29 13:43:18 +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
|
579a34355d
|
Fixed RoleSeeder.php
|
2020-07-29 13:28:25 +02:00 |
|
frederikpyt
|
ef8d1626ec
|
Fixed RoleSeeder.php
|
2020-07-29 13:21:51 +02:00 |
|
frederikpyt
|
556c0e1ba2
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 12:30:12 +02:00 |
|
frederikpyt
|
9a1ca59e5b
|
Permission fixes
|
2020-07-29 12:30:05 +02:00 |
|
Anders
|
bc2323b915
|
Removed @extends("app.layout.header") from a few blade.php files in app
|
2020-07-29 12:25:36 +02:00 |
|
frederikpyt
|
a5cb2e2cde
|
Permission fixes
|
2020-07-29 12:18:08 +02:00 |
|
frederikpyt
|
faec1f66c5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 11:53:46 +02:00 |
|
frederikpyt
|
569ace008a
|
Permission fixes and washing reservation fixes
|
2020-07-29 11:53:37 +02:00 |
|
victor
|
6a4cdbfb17
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 09:50:04 +02:00 |
|
victor
|
26c28d8e54
|
Made filter search
|
2020-07-29 09:49:54 +02:00 |
|
frederikpyt
|
fc0f97b04e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 15:13:43 +02:00 |
|
frederikpyt
|
b4f9065d79
|
Fixes
|
2020-07-28 15:13:33 +02:00 |
|
frederikpyt
|
606e13560b
|
Washing Reservation create
|
2020-07-28 15:03:17 +02:00 |
|
Anders
|
fd3f2de668
|
Merge remote-tracking branch 'origin/master'
|
2020-07-28 14:54:26 +02:00 |
|
Anders
|
556e6cf25a
|
You are now able to remove people who have signed up for events - With routing etc.
|
2020-07-28 14:54:19 +02:00 |
|
frederikpyt
|
fd2184c654
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/app/layout/base.blade.php
|
2020-07-28 14:30:37 +02:00 |
|
frederikpyt
|
c4e4d64014
|
Washing Reservation dynamic content
|
2020-07-28 14:26:32 +02:00 |
|
victor
|
63f2cc31d9
|
Fix live search again
|
2020-07-28 14:23:54 +02:00 |
|
victor
|
f6d762ba46
|
Revert "Added no match found on live search"
This reverts commit 47a07c61
|
2020-07-28 13:21:22 +02:00 |
|
victor
|
a90c9aa8cd
|
big smoke
|
2020-07-28 13:21:02 +02:00 |
|
victor
|
47a07c6174
|
Added no match found on live search
|
2020-07-28 11:31:39 +02:00 |
|
victor
|
2dba1fd8f7
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 11:07:41 +02:00 |
|
victor
|
c9cb3e99cd
|
Jeg er ikke sikker
|
2020-07-28 11:07:33 +02:00 |
|
Anders
|
cf533bb69f
|
Merge remote-tracking branch 'origin/master'
|
2020-07-28 10:31:49 +02:00 |
|
Anders
|
f9c11e67db
|
Error and succes messages when you change password as user
|
2020-07-28 10:31:44 +02:00 |
 Sebastian Davaris
|
22615b5f7d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 10:22:56 +02:00 |
|
Sebastian Davaris
|
fbe72420dc
|
Added RoleSeeder.php
|
2020-07-28 10:22:45 +02:00 |