Commit Graph

867 Commits

Author SHA1 Message Date
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
frederikpyt 7b52c43a05 v0.9.9a - Fixed order 2020-08-13 12:36:45 +02:00
frederikpyt d64e8fc4b8 v0.9.9 - Added custom 404 page 2020-08-13 12:06:28 +02:00
frederikpyt 0e266c2583 v0.9.8 - Fixed participate/stop participating, so that you no longer hard refresh 2020-08-13 11:39:10 +02:00
frederikpyt 2c8f947eb4 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-13 10:27:03 +02:00
frederikpyt 1f1ea3c832 v0.9.7 - Edited about 2020-08-13 10:26:43 +02:00
Neerholt f0a11000a6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-13 10:03:14 +02:00
Neerholt ea3ddb38a6 v0.9.5 - css stuff compile 2020-08-13 10:02:56 +02:00
frederikpyt a521b5ddea Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-13 09:36:00 +02:00
frederikpyt d969c76dcf v0.9.6 - Added print icons 2020-08-13 09:35:53 +02:00
Neerholt 58fba39538 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-13 09:20:04 +02:00
Neerholt 9c70a0c4b4 v0.9.5 - Removed images support from pdf menuplan, added dynamic name support for the pdf document 2020-08-13 09:19:44 +02:00
frederikpyt 6b9f77e7e7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-13 09:09:19 +02:00
frederikpyt aef8aa5d2c v0.9.4 - Added email notification when news gets added 2020-08-13 09:09:11 +02:00
Anders 0300a6a76b v0.9.4 - Added remove function to feedback admin page
Added - You can now see if you're participating an event on event.index and yourevents.blade.php
Fixed `Tilbage` buttons
2020-08-13 09:08:34 +02:00
Neerholt 4a46817265 v0.9.3 - Menuplan pdf converter now supports images download 2020-08-13 08:22:39 +02:00
frederikpyt 5c871c3fb7 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/MenuPlanController.php
2020-08-12 15:28:15 +02:00
frederikpyt fff03fd131 v0.9.2 - Added send notifications 2020-08-12 15:26:32 +02:00
Neerholt 0886c8f583 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-12 15:25:36 +02:00
Neerholt c84d2a3d73 v0.9.1 - You can now convert menuplan to pdf 2020-08-12 15:25:29 +02:00
Anders 2cbb517ef1 v0.9.0 - Added individual `Read more` buttons on news.index
Added NewsType - To see if it's a news, menu, guide or event
Added type column to News type_id & arrangement_id (Both needed to see what type (menu,guide,news,event) and arrangement(The individual types ID))
Added NewsTypeSeeder.php
Fixed CSS
Added & Fixed messages en/dk
Fixed Editors
Added routing when removing yourself from an event, on events.index
2020-08-12 15:17:48 +02:00
frederikpyt e06504b5fb Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/resources/lang/dk/msg.php
	skolehjem/resources/lang/en/msg.php
2020-08-12 13:10:37 +02:00
frederikpyt 4a8b22d6dd v0.8.5 - Fixed lang and css 2020-08-12 13:09:47 +02:00
Neerholt 6671cd6aa8 v0.8.4b - Made about pages 2020-08-12 13:08:47 +02:00
Neerholt d016ea6c4c v0.8.4a - Added last support for images uploade 2020-08-12 12:49:05 +02:00
Neerholt 7784623efe v0.8.4 - Images gitignore 2020-08-12 12:41:36 +02:00
Neerholt d0b286c714 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-12 12:28:13 +02:00
Neerholt e080b69d98 v0.8.3 - Added uploade images function 2020-08-12 12:28:05 +02:00
Neerholt 9c26526740 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-12 11:15:49 +02:00
Neerholt 1c6aa5c398 v0.8.1 - Added uploade images function to menuplan 2020-08-12 11:15:41 +02:00
frederikpyt edbdd7a292 v0.8.2 - Fixed user profile pic upload 2020-08-12 11:15:08 +02:00
frederikpyt 37d915a37f Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-12 10:46:45 +02:00
frederikpyt 55ab591b4e v0.8.1 - Started adding user profile pic 2020-08-12 10:46:36 +02:00
frederikpyt fb88bfa4c8 v0.8.0 - Fixed ResourceController.php 2020-08-12 10:44:54 +02:00
Anders 746926d439 v0.7.8 - Added Quill Editor to all sites - Fixed Event name/subname showance in news.index 2020-08-12 08:42:58 +02:00
frederikpyt 511e0b783f v0.7.7 - Various fixes 2020-08-11 18:21:51 +02:00
Neerholt 17434eb81d v0.7.5 - Added helpers to support substr closetag function 2020-08-11 15:30:34 +02:00
frederikpyt 2aaadd00b0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-11 15:08:36 +02:00
Neerholt ed568d12a8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-11 15:09:19 +02:00
Neerholt fc631ef66e v0.7.5 - Added substr to guide and event 2020-08-11 15:09:11 +02:00
frederikpyt b1b96ad080 v0.7.6 - Added snackbar 2020-08-11 15:08:09 +02:00
frederikpyt 1e4d55ef26 v0.7.4 - removed redundant code 2020-08-11 13:45:34 +02:00
frederikpyt e8278b7125 v0.7.3 - It now extends the layout 2020-08-11 13:44:18 +02:00
frederikpyt a9a9d42fb8 v0.7.3 - Major Fixes 2020-08-11 13:16:54 +02:00
frederikpyt 80ec936a0c v0.7.2 - Remember Me 2020-08-11 13:05:30 +02:00
frederikpyt b51704cc26 v0.7.1 - Major css fixes 2020-08-11 12:54:28 +02:00
frederikpyt c2ae6e08c3 v0.7.0 - Settings tab 2020-08-11 12:37:31 +02:00
Neerholt 76e0d7997a v0.6.2e - Made setting controller. Made on resource controller 2020-08-11 12:26:52 +02:00
Neerholt 2ae0c1661c v0.6.2d - Added are you sure you want to leave alert if you have unsaved data on a pages 2020-08-11 10:54:01 +02:00
Neerholt a223d5484e Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-11 10:40:08 +02:00
Neerholt 37b53a5480 v0.6.2c 2020-08-11 10:39:22 +02:00
frederikpyt 14fb54c5df v0.6.2b - Are you sure 2020-08-11 10:38:49 +02:00
frederikpyt 366f66215e v0.6.2a - Fixed css 2020-08-11 10:16:07 +02:00
frederikpyt 6e7cc443b8 v0.6.2a - Fixed css 2020-08-11 10:03:27 +02:00
frederikpyt 81af08ef24 v0.6.2 - Fixed various bugs 2020-08-11 09:55:01 +02:00
frederikpyt e5cf13c4c2 v0.6.1 - Fixed env 2020-08-11 09:32:36 +02:00
frederikpyt 5137d6da9d v0.6.1 - Added jquery 2020-08-11 09:27:19 +02:00
frederikpyt e391acf261 v0.6.1 - Added jquery 2020-08-11 09:27:07 +02:00
frederikpyt 64c260a63f v0.6.0 - Darkmode 2020-08-11 09:13:48 +02:00
Neerholt d071e583f5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/public/css/webappdark.css
2020-08-11 08:14:15 +02:00
Neerholt 0fbda9e12b v0.5.18s - bare commit det 2020-08-10 15:28:25 +02:00
frederikpyt 1428d88716 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 15:20:01 +02:00
frederikpyt 3d0afb2d6a v0.5.18 - Darkmode 2020-08-10 15:19:53 +02:00
Neerholt ea0d544509 v0.5.17c - Fix small bugs on darkmode 2020-08-10 14:59:22 +02:00
frederikpyt 72824d87f2 v0.5.17b - Darkmode 2020-08-10 14:53:49 +02:00
Neerholt 511b4a288b v0.5.17a - Made darkmode 2020-08-10 14:49:00 +02:00
Neerholt 89f8b2be44 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 13:26:56 +02:00
Neerholt 86536ba978 v0.5.17 - Made some small css changes to guides layout 2020-08-10 13:26:48 +02:00
frederikpyt 534fbe2efd Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 12:44:45 +02:00
frederikpyt 2ad27412a3 v0.5.17 - Fixed bugs 2020-08-10 12:44:29 +02:00
Neerholt c410f3feb6 v0.5.16a - Fixed SSL bug 2020-08-10 12:44:26 +02:00
frederikpyt 79d09464f2 v0.5.17 - Fixed bugs 2020-08-10 12:44:20 +02:00
Anders 2cc78c5d7c Merge remote-tracking branch 'origin/master' 2020-08-10 12:29:44 +02:00
Anders 2e187524bf v0.5.16 - Fixed Cookie Problem on controllers. Added quill editor on event. Added message in msg.php en/dk 2020-08-10 12:29:38 +02:00
frederikpyt 50b495ee01 v0.5.15i - Fixed bugs 2020-08-10 12:14:09 +02:00
frederikpyt bb1aade947 v0.5.15h - Fixed bugs 2020-08-10 12:07:41 +02:00
Neerholt 74767b3336 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 12:06:52 +02:00