vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
604 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

360 Commits

Author SHA1 Message Date
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
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 408eb7090b Fixed CSS 2020-08-04 10:40:01 +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 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 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
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 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
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 0e77da93b2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-30 14:51:50 +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
Anders f4ba4f6c45 Edited text 2020-07-30 12:20:52 +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
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
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 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
Anders bc2323b915 Removed @extends("app.layout.header") from a few blade.php files in app 2020-07-29 12:25:36 +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 f9c11e67db Error and succes messages when you change password as user 2020-07-28 10:31:44 +02:00
Anders 8d8b5491c9 Removed unused/commented code 2020-07-28 10:17:00 +02:00
Anders 4d994d704b Merge remote-tracking branch 'origin/master' 2020-07-28 10:13:52 +02:00
Anders 80725dee12 Made it possible to sign up for events. 
Added fail and success messages when signing up.
Fixed unique keys in migrate
 2020-07-28 10:13:44 +02:00
victor 9a5be4e280 Name fix for contact 2020-07-28 09:23:28 +02:00
frederikpyt e5e937b76c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 09:23:17 +02:00
frederikpyt 282ac8e735 Fixed washing reservation bugs 2020-07-28 09:21:41 +02:00
Anders a679abea52 Route to UserEventController 2020-07-28 08:44:25 +02:00
Anders 0d221c8439 Merge remote-tracking branch 'origin/master' 2020-07-27 14:59:03 +02:00
Anders ca3e2689ea Frontpage fixed 2020-07-27 14:58:56 +02:00
Neerholt 519bd70ace
Merge branch 'master' into LiveSearch 2020-07-27 14:23:13 +02:00
victor b9633d36a9 Made Live search is done 2020-07-27 16:03:49 +02:00
victor f1fb73beec Fix css on live search, live search now works 2020-07-27 14:03:57 +02:00
frederikpyt 4eaf3de6d5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-27 13:35:15 +02:00
frederikpyt 661d8a0f69 Fixed users and role implementation 2020-07-27 13:35:00 +02:00
frederikpyt 0c8cad9668 Fixed contacts 2020-07-27 13:34:45 +02:00
victor 2dd20ac85a Semi fix live search 2020-07-27 13:07:19 +02:00
Anders 4b571781a5 Worked on base.blade.php 2020-07-27 10:31:57 +02:00
Sebastian Davaris 010322b605 Fixed frontend fuckup #3 2020-07-27 10:20:29 +02:00
Neerholt 9c17623518 Live search 2020-07-07 19:29:21 +02:00
frederikpyt 471a2897a5 Fixed redirect 2020-07-01 11:59:48 +02:00
Neerholt 4e69768ae8 Lavet controller og et forsøg på GUI 2020-07-01 11:46:29 +02:00
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 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +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
frederikpyt 6ecc96ef55 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 09:50:36 +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