Commit Graph

507 Commits

Author SHA1 Message Date
Neerholt 6b3af7e667 v0.10.14b - We now delete events from the database if the event passes the event data 2020-08-24 10:43:24 +02:00
Neerholt 5ebb8bc5a2 v0.10.14a - small css fix on event 2020-08-24 10:20:34 +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 522cf9cdf7 v0.10.12a - Made filter for washing machines done 2020-08-21 10:54:00 +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
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
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
frederikpyt abd9ebbe3e v0.10.7 - Fixed washing_reservation creation on app, hopefully forever 2020-08-18 22:47:39 +02:00
Neerholt d2441250fb v0.10.5c - Made menuplan pdf better 2020-08-18 15:27:58 +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
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
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 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
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 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
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
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
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
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
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 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
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
Neerholt 17434eb81d v0.7.5 - Added helpers to support substr closetag function 2020-08-11 15:30:34 +02:00
frederikpyt b1b96ad080 v0.7.6 - Added snackbar 2020-08-11 15:08:09 +02:00
frederikpyt 80ec936a0c v0.7.2 - Remember Me 2020-08-11 13:05:30 +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
frederikpyt 64c260a63f v0.6.0 - Darkmode 2020-08-11 09:13:48 +02:00
Neerholt 511b4a288b v0.5.17a - Made darkmode 2020-08-10 14:49:00 +02:00
frederikpyt 534fbe2efd Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 12:44:45 +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 8dba709ce1 v0.5.15g - added https support 2020-08-10 12:06:44 +02:00
Neerholt 332fdc3347 v0.5.15e - Removed search function from menuplan and fix some css on event search 2020-08-10 11:45:58 +02:00
Neerholt 1d8d89d299 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 11:06:41 +02:00
Neerholt 9a11e4b52c v0.5.15b - optimized user search, so it now works like a charm :) 2020-08-10 11:06:27 +02:00
frederikpyt c077b0e55f v0.5.15c - Fixed bug 2020-08-10 10:28:40 +02:00
frederikpyt 1bea8401b4 v0.5.15b - Fixed bug 2020-08-10 10:21:09 +02:00
Neerholt 3263663f3d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/app/Http/Controllers/EventController.php
2020-08-10 10:17:41 +02:00
Neerholt b27d05e55c v0.5.15a - Made read more 2020-08-10 10:16:05 +02:00
frederikpyt fead36dd52 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
 Conflicts:
	skolehjem/resources/views/app/news/index.blade.php
2020-08-10 09:39:12 +02:00
frederikpyt bd7800f5a0 v0.5.15 - Added subname to news 2020-08-10 09:37:19 +02:00
Neerholt a011df41ee v0.5.14c - Fixed middelware typo 2020-08-10 09:18:00 +02:00
Neerholt 2db8032635 v0.5.14c - Fixed route error when you clicked on participate 2020-08-10 09:17:21 +02:00
Neerholt 9841cbd24e v0.5.14a -Made cookies more oo oriented 2020-08-08 23:51:24 +02:00
Anders 726cb52aee v0.5.14 - Fixed signups on event. Added en/dk versions. Added TinyMCEditor on events create/edit. Removed menuplans monday-thursday 2020-08-07 14:11:13 +02:00
Anders d921803dfd v0.5.12a - Fixed store of event 2020-08-07 12:59:21 +02:00
Neerholt 376f37da8c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-07 12:48:15 +02:00
Neerholt 04c280e602 v0.5.12 - Add read more to guides, and made specific pages to read a specific guide 2020-08-07 12:48:08 +02:00
Anders 9a6d1b64c1 v0.5.11 - Changed CKEditor to TinyMCEditor / Removed Monday-Thursday in menu_plans and added a TinyMCEditor instead. 2020-08-07 12:20:15 +02:00
frederikpyt c268440021 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-07 10:59:02 +02:00
frederikpyt b0eda7f8e7 v0.5.10 - Added support for menuplan as news creation 2020-08-07 10:58:50 +02:00
Anders e0b998dec0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/Http/Controllers/UserEventController.php
2020-08-07 10:52:25 +02:00
Anders a23337b9d4 v0.5.9 - Fixed en/dk messages + added backend en/dk messages 2020-08-07 10:51:10 +02:00
frederikpyt c02c1aacd3 v0.5.8b - Fix 2020-08-07 10:36:08 +02:00
frederikpyt f7941841fe v0.5.8a - Fix 2020-08-07 10:25:46 +02:00
frederikpyt 4c2b58f33b Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/resources/views/admin/events/create.blade.php
2020-08-07 09:49:31 +02:00
frederikpyt 246004ebfd v0.5.8 - Added create news option on guide and event create/edit 2020-08-07 09:47:23 +02:00
Neerholt b5fb505eaa
Merge pull request #3 from sebathefox/Multi-language
v.0.5.8 - Multi language
2020-08-07 08:53:29 +02:00
Neerholt 60391793fc v0.5.7b - Added middelware 2020-08-07 08:52:01 +02:00
Neerholt e5e057a51a v0.5.7a - Added middelware 2020-08-07 08:51:05 +02:00
Anders 76e3638706 v0.5.6b - Added error messages when loggin in with wrong credentials, when changing password and when logging out - Admin & User 2020-08-07 08:35:23 +02:00
Neerholt 7cc871ae90 v0.5.7 - Made multi language option 2020-08-06 15:31:38 +02:00
Anders 1b7738fd09 Merge remote-tracking branch 'origin/master' 2020-08-06 14:47:28 +02:00
Anders 708313a4b3 v0.5.6 - Fixed Guide when destroying.
Added accountable in Event table to see who is the accountable for the event. Changed description field to CKEditor
2020-08-06 14:47:22 +02:00
frederikpyt 4c2fc5f5f0 v0.5.5A - Small fixes 2020-08-06 13:35:07 +02:00
frederikpyt 3e4e6e71ab v0.5.5 - Added news on the admin panel 2020-08-06 12:21:19 +02:00
frederikpyt 4b0ad949ba v0.5.4 - Created the "reservations in location" screen and added a location option when creating reservations. 2020-08-06 10:32:34 +02:00
frederikpyt 358e47b703 v0.5.3A - Added permission requirements to GuideController.php 2020-08-06 08:44:21 +02:00
frederikpyt f4a277185d Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-06 08:37:28 +02:00
frederikpyt 5452711665 v0.5.3 - Added Locations and a location_id to washing machines 2020-08-06 08:37:16 +02:00
Neerholt a04c38636b v0.5.2 - Made the new menuplan, so you now can use CKeditor. 2020-08-05 14:59:41 +02:00
frederikpyt 76bea82eea v0.5.1 - Made contact phone number optional and updated data in seeders. 2020-08-05 13:29:45 +02:00
Anders 02b6684030 Added - Deleting Washing Reservations when deleting a washing machine 2020-08-05 10:11:28 +02:00
Anders f988967c22 Guides - Fixed
Contact - Added phonetimes
2020-08-05 09:43:53 +02:00
Anders 91f7a4aa05 Merge remote-tracking branch 'origin/master' 2020-08-05 09:24:08 +02:00
Anders a78e7d90f6 Fixed - Guides
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
frederikpyt ee3caae76a Fixes 2020-08-05 09:15:50 +02:00
frederikpyt 072c5c65ab Fixes and todo's 2020-08-05 08:10:38 +02:00
frederikpyt 64d1f785f9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/WashingReservationController.php
2020-08-04 16:52:42 +02:00
frederikpyt 50d8079da2 fixes 2020-08-04 15:29:21 +02:00
Neerholt 4f1ff3a823 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-04 15:29:18 +02:00
Neerholt 9dd09f2205 Made it so they can now make there own dynamic guide 2020-08-04 15:29:08 +02:00
Anders 0e72166ac4 Removed External Links 2020-08-04 15:20:56 +02:00
Anders d15f406059 Fail message when making a reservation with taken machine and time 2020-08-04 15:09:10 +02:00
frederikpyt 5973b94247 Merge remote-tracking branch 'origin/master' 2020-08-04 14:11:33 +02:00
frederikpyt 66f7e3b86b fixes 2020-08-04 14:11:05 +02:00
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
frederikpyt 694bd35b33 Implemented forgot password 2020-08-04 13:21:56 +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 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 f551d4c59f Changed session messages on fail or success 2020-08-04 08:04:54 +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