Commit Graph

630 Commits

Author SHA1 Message Date
Neerholt 201e2b5b35 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-09-10 10:39:16 +02:00
Neerholt e08a8aa509 v1.1.0 - Washing machines and locations is on the same pages now, made bruger roles immortal so you cant delete it or edit it 2020-09-10 10:39:07 +02:00
Anders e483400d82 v1.1.0 - Users can now sign up (Automatically gets 'Bruger' role) 2020-09-10 10:25:27 +02:00
Anders 3b86e29c00 v1.0.0c - Fixed CSS 2020-09-09 12:20:50 +02:00
Anders a1cda94b13 Small change for ekapp (No need for comit number) 2020-09-09 09:20:50 +02:00
Anders cc49bf4252 v1.0.0b - Removed name + emails (Only commented out) 2020-09-09 09:16:56 +02:00
Anders 5d82e7251b v1.0.0a - Edited CSS & Controller img's 2020-09-09 09:15:17 +02:00
Anders ee47ffc0ed Merge remote-tracking branch 'origin/master' 2020-09-08 14:12:29 +02:00
Anders 720faac2ff v1.0.0 - Version 1 [Open Beta] Open for launch!
Added tooltips for roles.create & roles.edit
#900Commits
2020-09-08 14:12:22 +02:00
frederikpyt 6c4fceb697 v0.12.3 - Fixed reset password and email charset 2020-09-08 08:48:30 +02:00
Anders 66762efb8a v0.12.2 - Added feedback storing to ajax instead of backend 2020-09-07 14:21:59 +02:00
Anders 1030bcc13f v0.12.1 - Added css to headers 2020-09-07 13:10:20 +02:00
Anders d4ac70de70 v0.12.0 - Fixed pagination
Fixed RolesController.php - Changes "User" to "Bruger"
Added æøåÆØÅ to roles pattern
Fixed bugs/mistakes
2020-09-07 12:44:24 +02:00
Anders 02527035c9 v0.11.4a - Removed unused script 2020-09-07 09:54:14 +02:00
Anders 976f1b5bf0 v0.11.4 - Added AJAX onclick function to users.edit (Now it checks if email & phone number already exists) 2020-09-07 09:53:15 +02:00
Anders 5f234d95dc v0.11.3 - Fixed roles
Added pattern to passwords
2020-09-07 08:33:46 +02:00
Neerholt 84f5c51c48 v0.11.2b - Made a support user account 2020-09-07 08:28:49 +02:00
Neerholt b62582e039 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-09-03 08:31:42 +02:00
Neerholt ed51bb99fa v0.11.2a - Fixed pagination, made a create user 2020-09-03 08:31:31 +02:00
frederikpyt b4d80ac76f v0.11.2 - Added autoscroll 2020-09-02 15:19:18 +02:00
frederikpyt ebd80a31b8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-09-02 15:11:07 +02:00
frederikpyt 4811c5f7af v0.11.1f - Fixed css 2020-09-02 15:10:58 +02:00
Anders 842933f4df v0.11.1e - Fixed roles.create/edit - Added comment to users.create (To add a pattern later) 2020-09-02 13:31:56 +02:00
Anders 821428c150 v0.11.1d - Fixed WashingReservation 2020-09-02 13:15:11 +02:00
Anders 2f5a03343a Merge remote-tracking branch 'origin/master' 2020-09-02 12:32:36 +02:00
Anders ff7cb033d5 v0.11.1c - Fixed CSS & HTML 2020-09-02 12:32:30 +02:00
frederikpyt 211a68c81b v0.11.1b - Fixed 2020-09-02 12:31:44 +02:00
frederikpyt f2500730ec v0.11.1a - Maybe fix? 2020-09-02 12:20:49 +02:00
frederikpyt 4a64d49902 v0.11.1 - Fixed roles and permissions 2020-09-02 11:40:36 +02:00
Anders d7bfdaebf6 v0.11.0 - You can now edit roles
Fixed minor details
2020-09-02 08:56:02 +02:00
Anders 25c279653b v0.10.20c - Changed type_id to type on news.index, so it's no longer a number 2020-08-31 14:54:25 +02:00
frederikpyt 101be37dfe Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:44:15 +02:00
frederikpyt 34b078b21a v0.10.20b - Darkmode fixes 2020-08-31 14:41:44 +02:00
Anders 9b26e5f1af Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/Http/Controllers/RootController.php
#	skolehjem/resources/views/app/news/index.blade.php
2020-08-31 14:35:03 +02:00
Anders cf1baac983 v0.10.20a - Changed type_id to type on news.index, so it's no longer a number 2020-08-31 14:31:56 +02:00
Neerholt efb2840ff0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/RootController.php
2020-08-31 14:29:24 +02:00
Neerholt 20aa9c52af v0.10.20 - Made some small design changes to home pages 2020-08-31 14:28:15 +02:00
Anders bccd00683f v0.10.19 - Added building name to reservation site
Fixed $eventsToDelete in EventController.php
2020-08-31 14:04:02 +02:00
frederikpyt 56cdd63fbb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 11:56:17 +02:00
frederikpyt 34e123ee19 v0.10.17a - Various fixes 2020-08-31 11:56:05 +02:00
Anders 10bd0c021c Merge remote-tracking branch 'origin/master' 2020-08-31 10:57:31 +02:00
Anders 7b157fcd90 v0.10.17 - Added permission check (create/edit/delete) on all admin sites 2020-08-31 10:57:26 +02:00
frederikpyt 59bd705d89 v0.10.16a - Various fixes 2020-08-31 10:15:12 +02:00
frederikpyt c6c54996b5 v0.10.16 - Various fixes 2020-08-31 09:36:10 +02:00
frederikpyt d8a754d398 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-31 08:16:36 +02:00
frederikpyt 08362b24cb v0.10.15q - Various fixes 2020-08-31 08:16:26 +02:00
Neerholt 7d4bd47ab8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-28 08:28:44 +02:00
Neerholt 3235cea505 v0.10.15o - Permissions semi works 2020-08-28 08:28:32 +02:00
Anders e0af87ba97 v0.10.15n - Added a functional Full Control button to roles.create 2020-08-28 08:26:32 +02:00
Neerholt b6d819e5f8 v0.10.15m - added the last value to roles permissions 2020-08-27 16:40:46 +02:00
Neerholt 4beadfb223 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-27 15:30:26 +02:00
Neerholt a766bfea95 v0.10.15l - Made role permissions semi done, sometimes it works sometimes it doesn't, it needs some touch up 2020-08-27 15:29:59 +02:00
frederikpyt fc91a2f06b v0.10.15i - Fixed admin access 2020-08-27 11:12:43 +02:00
Neerholt 5766770a4b v0.10.15g - Added roles permissions selection, semi done 2020-08-27 10:20:48 +02:00
Anders 7b2d6fcf60 Merge remote-tracking branch 'origin/master' 2020-08-26 10:49:19 +02:00
Anders b72ca3fbde v0.10.15f - Added video to guides (Still in need of <iframe></iframe> to be removed on news site) 2020-08-26 10:49:11 +02:00
Neerholt a9608bdf3a v0.10.15e - Administration can now changes a users profile images 2020-08-26 08:56:18 +02:00
Anders f33cf609da v0.10.15d - Changed remember password to remember me
Added pattern to user edit on admin site
2020-08-25 15:08:54 +02:00
Anders 0bd324e996 Merge remote-tracking branch 'origin/master' 2020-08-25 14:48:58 +02:00
Anders 3b6b20f934 v0.10.15c - Changed error message when changing password (removed quotes). Added placeholder to email & phone number + added pattern to phone number 2020-08-25 14:48:52 +02:00
frederikpyt c1972e70c8 v0.10.15b - Fixed scroll 2020-08-25 14:16:47 +02:00
Neerholt f5e3e0c6e0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-25 14:07:29 +02:00
Neerholt e758a3ddac v0.10.15a - Added hide Menu on Scroll 2020-08-25 14:07:20 +02:00
frederikpyt 5a1c1ee6fd Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-25 12:28:39 +02:00
frederikpyt 725b34f6bf v0.10.15 - Fixed EventController.php deletion of old events 2020-08-25 12:28:28 +02:00
Anders bc847b38b0 v0.14.15 - Removed the first foreach in location show, and made an inner join instead, so it comes in correct order (by time), instead of by time and by machine id.
Added: The Reservations now gets deleted when time is past their washing time, as soon as you go onto your own reservations, the admin page for reservations or when the location show page reloads (every 1 minut)
2020-08-25 12:26:48 +02:00
Neerholt 0c8791683f Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-25 12:00:33 +02:00
Neerholt fa606bd89f v0.10.14h - Added tooltips to navbar 2020-08-25 12:00:10 +02:00
Anders e1a2fd87f7 v0.14.14g - Fixed mails 2020-08-25 09:49:45 +02:00
Neerholt f33b2bb45c v0.10.14g - Fixed images error on washing machines 2020-08-25 09:25:42 +02:00
Anders 6569255d32 v0.14.14f - Fixed text in about.index 2020-08-25 08:15:25 +02:00
Anders 7cb88d8b58 Merge remote-tracking branch 'origin/master' 2020-08-24 14:25:56 +02:00
Anders 3e18809584 v0.10.14e - Location site now reloads with the div instead of the whole page 2020-08-24 14:25:50 +02:00
Neerholt abcc484e7c v0.10.14d - No can now see the users images on user admin 2020-08-24 14:09:03 +02:00
Neerholt fa5cd1c3e2 v0.10.14c - Various fixes 2020-08-24 11:27:17 +02:00
frederikpyt 9a1b6873d2 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 10:17:15 +02:00
frederikpyt 7a02f4a48f v0.10.14 - Fixed localstorage saving for the admin menu and added ResourceCategorySeeder.php 2020-08-24 10:17:08 +02:00
Neerholt e60c386b0e v0.10.13c - Small css fix made to user search filter 2020-08-24 10:08:19 +02:00
Anders 0655611a77 v0.10.13a - Fixed feedback so date can be seen - Fixed about page 2020-08-24 09:55:20 +02:00
Neerholt 7719b4b77b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 09:05:25 +02:00
Anders 556821ec8f Merge remote-tracking branch 'origin/master' 2020-08-24 09:00:27 +02:00
Anders 43893ab8ed v0.10.13 - Fixed: You can't see an event, if it's one day over time
Removed search bar from events
Added: You can't click on sites you're already on at the admin panel
2020-08-24 09:00:21 +02:00
Neerholt 679d5a0c3e v0.10.12a - Feedback fix 2020-08-24 09:00:15 +02:00
frederikpyt d280f6c7bc v0.10.12b - Fixed localstorage saving for the admin menu 2020-08-24 08:59:50 +02:00
Frederik Milling Pytlick 6d551b42d0
Update base.blade.php 2020-08-21 13:44:33 +02:00
Sebastian D 6e277e9e79
Update base.blade.php 2020-08-21 13:41:06 +02:00
Neerholt 814695b720 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-21 10:54:09 +02:00
Neerholt 522cf9cdf7 v0.10.12a - Made filter for washing machines done 2020-08-21 10:54:00 +02:00
frederikpyt 3d61c20a5a v0.10.12 - Localstorage saving for the admin menu 2020-08-21 08:45:39 +02:00
frederikpyt a0566360e0 v0.10.11d - Small optimizations 2020-08-21 07:59:14 +02:00
frederikpyt 27e3eed6f4 v0.10.11c - Removed <br> 2020-08-21 07:57:48 +02:00
frederikpyt e35c8ae491 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-20 15:12:12 +02:00
frederikpyt 2b1c284b6a v0.10.11b - Added active site 2020-08-20 15:12:06 +02:00
Neerholt f403c464c7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-20 14:59:31 +02:00
Neerholt 89276c5af1 v0.10.11a - Made hide filter, filter washing machine search semi done, and texts fixs 2020-08-20 14:59:22 +02:00
frederikpyt ab5a6206ce Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-20 14:56:18 +02:00
frederikpyt c0d336a8e0 v0.10.11 - Collapse-able admin menu 2020-08-20 14:56:11 +02:00
Anders a145c88e2c v0.10.10f - You can no longer see your own reservations if they're an hour past due (Samt with admin) 2020-08-20 12:18:30 +02:00
Neerholt 4f9cf41656 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 15:30:47 +02:00
Neerholt 0516acba78 v0.10.10e - Made a hide show filter button, not done but works, css fix tomorrow 2020-08-19 15:30:39 +02:00