Commit Graph

843 Commits

Author SHA1 Message Date
Neerholt 5ebb8bc5a2 v0.10.14a - small css fix on event 2020-08-24 10:20:34 +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
Neerholt 137d878748 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-24 10:01:26 +02:00
Neerholt c2ddfcf346 v0.10.13b - Fixed images error after you had searched 2020-08-24 10:01:18 +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
Sebastian D 78f97cbe9f
Create normalize.css 2020-08-21 13:39:45 +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
Anders b47c06372b v0.10.10d - Fixed quill asset mistake 2020-08-19 15:09:54 +02:00
frederikpyt cca543bf4a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 14:59:20 +02:00
frederikpyt 41af387399 v0.10.10c - Not done 2020-08-19 14:59:13 +02:00
Neerholt ec4fdca414 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 10:44:07 +02:00
Neerholt a8fc584304 v0.10.10b - Added small fixs to pagination 2020-08-19 10:43:59 +02:00
Anders ae306c8f1b Merge remote-tracking branch 'origin/master' 2020-08-19 10:35:51 +02:00
Anders 3f2dcf1a0c v0.10.10a - Added Quill.js & Quill.snow.css to our own files, instead of calling it. - Removed uneccesary quill.snow.css in menuplan 2020-08-19 10:35:44 +02:00
frederikpyt 5aebe1328d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 10:01:38 +02:00
frederikpyt 7e9277bd21 v0.10.10 - Fixed it so you can only upload image resources when uploading your profile picture 2020-08-19 10:01:22 +02:00
Neerholt 2f003600c5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-19 09:54:31 +02:00
Neerholt 6934c2d992 v0.10.9 - Added pagination onto guides, washing-reservations, events and news 2020-08-19 09:54:26 +02:00
Anders 82ac44133b v0.10.8 - Added - You can only see washingreservations for the day, and are maximum an hour after 'time' in column - Reloads the page after every 5 minutes (This needs a fix) 2020-08-19 09:01:21 +02:00
frederikpyt 2430a6a381 v0.10.7b - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:55:50 +02:00
frederikpyt abd9ebbe3e v0.10.7 - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:47:39 +02:00
frederikpyt 52b42124a1 v0.10.6 - Uniformily changed the event name 2020-08-18 19:09:40 +02:00
Neerholt 4233a35e66 v0.10.5d - dompdf 2020-08-18 15:28:49 +02:00
Neerholt d2441250fb v0.10.5c - Made menuplan pdf better 2020-08-18 15:27:58 +02:00
Anders f6feb8a818 Merge remote-tracking branch 'origin/master' 2020-08-18 13:01:45 +02:00
Anders 19b1176718 v0.10.5b - Added Date to feedbacks.index 2020-08-18 13:01:39 +02:00
Neerholt 70437aaffa Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-18 12:33:12 +02:00
Neerholt d851354086 v0.10.5 - Added middelware 2020-08-18 12:33:04 +02:00
Anders ddbc3b8b60 v0.10.5 - Fixed vagttelefon
Added: Washing Machines & their reservations now delete when the location gets removed
2020-08-18 12:25:32 +02:00
frederikpyt d49a896fc0 v0.10.4 - Downloaded moment-js 2020-08-18 11:54:26 +02:00
frederikpyt 088fcd7f39 v0.10.3c - Fixed dark mode css 2020-08-18 09:02:03 +02:00
frederikpyt af751e2352 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-18 08:36:07 +02:00
frederikpyt 1e405d9f3c v0.10.3 - Added user "X X" to seeder, and fixed analytics 2020-08-18 08:35:53 +02:00
Anders a19d8b91b0 Merge remote-tracking branch 'origin/master' 2020-08-18 08:30:28 +02:00
Anders 556f242595 v0.10.3a - Fixed: When deleting a location you now also delete the washing machines 2020-08-18 08:30:20 +02:00
frederikpyt 55153521b4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-18 08:19:20 +02:00
frederikpyt 44ade93240 v0.10.3 - Fixed darkmode css on app/washing-reservations/create.blade.php. Fixed frontend file upload valdiation. Fixed analytics 2020-08-18 08:19:14 +02:00
Anders e6e0e3c95d v0.10.2 - Full functioning AJAX check submit code on User controller create & edit
- Plus all other pages where you create or update something of an unique value
2020-08-18 08:16:25 +02:00
Anders c08933ba9b v0.10.1b - Added error message when creating a user with a difference in `Adgangskode` & `Bekræft Adgangskode`
Removed old error messages
2020-08-17 15:25:26 +02:00
Anders 58c6d08ca2 Merge remote-tracking branch 'origin/master' 2020-08-17 15:10:52 +02:00
Anders d19b9c1d1a v0.10.1a - Added AJAX check on update WashingMachine
Added AJAX check on create (missing on update) UserController - Only checks when submitting
2020-08-17 15:10:44 +02:00
frederikpyt 4a72493f9b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 15:06:55 +02:00
frederikpyt 983b02e00e v0.10.1 - Added location on washing_reservations and created a WashingMachineSeeder.php 2020-08-17 15:06:48 +02:00
Neerholt e6fbafb011 v0.10.0i - :( 2020-08-17 15:06:35 +02:00
Neerholt 0144fb8586 v0.10.0h - Fixed phone number bug, changed phone number from int to string 2020-08-17 14:42:58 +02:00
Neerholt d4bc3f5520 v0.10.0g - Fixed stuff :) 2020-08-17 14:24:27 +02:00
Neerholt 25f1dc80d4 v0.10.0f - Fixed a route error on main index pages, when you clicked on see participants 2020-08-17 13:52:51 +02:00
Neerholt 7f42423599 v0.10.0e - Made some css fix to the main index dashboard pages 2020-08-17 13:22:08 +02:00
Neerholt 8bba60fa5a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 12:24:49 +02:00
Neerholt 9db169aadb v0.10.0d - Rolled back menuplan to old system layout and functionality 2020-08-17 12:24:43 +02:00
Anders 5ac480454a v0.10.0c - Fixed WashingMachine create & update AJAX 2020-08-17 11:07:26 +02:00
Anders 3bde377caa v0.10.0b - Fixed Location update AJAX
Added - You are now able to delete a location
2020-08-17 10:43:52 +02:00
Neerholt 773655c294 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 10:31:41 +02:00
Neerholt fe9eb4fd4d v0.10.0a - Added last support for NameCheck 2020-08-17 10:31:33 +02:00
frederikpyt e82c793820 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 10:29:02 +02:00
frederikpyt 9596a426fa v0.10.0 - Added admin dashboard 2020-08-17 10:28:54 +02:00
Anders cf957429c3 v0.9.15i - Fixed EN/DK Reservations 2020-08-17 10:27:29 +02:00
Anders e6f03ad72b v0.9.15h - NameCheck - Fixed Updates 2020-08-17 10:21:02 +02:00
Neerholt 5f516992d7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-17 09:21:57 +02:00
Neerholt ea623a72ca v0.9.15g - NameCheck 2020-08-17 09:21:47 +02:00
Anders 4358f272ed Merge remote-tracking branch 'origin/master' 2020-08-17 08:26:08 +02:00
Anders 4b44f24be4 v0.9.15f - Fixed Feedback backend 2020-08-17 08:26:01 +02:00
Neerholt fce970de65 v0.9.15e - made nameCheck for guides 2020-08-17 08:23:48 +02:00
frederikpyt 604d5dad19 v0.9.15d - Fixed bug 2020-08-14 12:10:18 +02:00
frederikpyt 7dfcc36d07 v0.9.15c - Delete news when you delete its guide 2020-08-14 12:07:18 +02:00
frederikpyt dccc084dee Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-14 11:22:25 +02:00
Neerholt a4509fa412 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-14 11:22:59 +02:00
Neerholt 8a71d1d5ae v0.9.15a - optimized nameCheck 2020-08-14 11:22:51 +02:00
frederikpyt 051aceb041 v0.9.15b - Updated the menuplan pdf design 2020-08-14 11:22:18 +02:00
Anders 45d1906497 v0.9.14 - Made an `Do you want email` slider on settings site 2020-08-14 10:17:52 +02:00
Neerholt c37645fe85 v0.9.13b - Made your event taben look better 2020-08-14 09:03:15 +02:00
frederikpyt 804a39e2a1 v0.9.13a - Updated .env.example 2020-08-14 07:44:33 +02:00
frederikpyt 55eed84b86 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/EventController.php
2020-08-14 07:39:27 +02:00
frederikpyt 9e0f449bd3 v0.9.13 - Added notifications in events, when an event you're signed up to gets canceled. 2020-08-14 07:36:42 +02:00
Anders 9232ed99a1 v0.9.12 - Fixed CSS - Started working on wants_email button in account 2020-08-13 15:28:20 +02:00
victor 8bfcfb6441 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-13 14:41:19 +02:00
victor 3a78734b7f v0.9.11 - Check if event name already exist. 2020-08-13 14:41:10 +02:00
frederikpyt bd0d504ab8 v0.9.10 - Added wants_emails 2020-08-13 13:50:00 +02:00