Commit Graph

872 Commits

Author SHA1 Message Date
frederikpyt 3064d412b3 Fixed app 2020-08-04 08:56:59 +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 6152d19ed4 Created android app 2020-08-03 22:03:54 +02:00
frederikpyt 5e4b0fec76 Created android app 2020-08-03 21:45:42 +02:00
frederikpyt 46154e43e9 Created android app 2020-08-03 21:21:21 +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