Commit Graph

801 Commits

Author SHA1 Message Date
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
Neerholt 8dba709ce1 v0.5.15g - added https support 2020-08-10 12:06:44 +02:00
frederikpyt 6cabc6250c Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-10 11:47:07 +02:00
frederikpyt d1a2ec8210 v0.5.15f - Fixed small visual bug 2020-08-10 11:46:08 +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 bc6626f997 v0.5.15d - Fixed bug 2020-08-10 10:29:52 +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 9c0f46e665 v0.5.14b - index event fix 2020-08-10 09:08:48 +02:00
Neerholt 15962e4114 v0.5.14b -Added Css 2020-08-10 09:05:53 +02:00
Neerholt 9841cbd24e v0.5.14a -Made cookies more oo oriented 2020-08-08 23:51:24 +02:00
Neerholt a97cd7cda5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-07 14:25:08 +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
Neerholt 0cea9e50c1 v0.5.14 -Added see participant to events taben it self 2020-08-07 13:50:26 +02:00
Anders 9d6fc22b0f v0.5.13 - Added signups.blade.php to see who have joined an event + en/dk versions 2020-08-07 13:31:09 +02:00
Anders 8388fecfb6 v0.5.12b - Fixed description of events (string to longText) 2020-08-07 13:00:37 +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 23929310f7 v0.5.7 - Add the last support for english 2020-08-06 20:33:46 +02:00
Neerholt f96d23814b v0.5.7 - Add msg English and msg Danish 2020-08-06 15:32:21 +02:00
Neerholt 7cc871ae90 v0.5.7 - Made multi language option 2020-08-06 15:31:38 +02:00
Anders 6e2ffa8de4 v0.5.6a - Fixed description when seeing your events 2020-08-06 14:50:07 +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 c472ae80fa v0.5.5B - Change app home page to news page 2020-08-06 14:30:18 +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 ab4275dc33 v0.5.4C - Added a back button on forgot password 2020-08-06 11:17:55 +02:00
frederikpyt c56fb6a96d v0.5.4B - Fixed some css 2020-08-06 10:57:18 +02:00
frederikpyt 2d9bd2e11c v0.5.4A - Added a no reservations message on "reservations in location" page 2020-08-06 10:49:16 +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 7ea2208b4a Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 2020-08-05 14:59:59 +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 9b631843b0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/database/seeds/ContactSeeder.php
2020-08-05 13:30:32 +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 121476de60 Fixed title 2020-08-05 11:14:30 +02:00
Anders 21f3832564 Fixed title 2020-08-05 11:11:45 +02:00
Anders 7d5273be8d Fixed Images 2020-08-05 10:34:21 +02:00
Anders eab59b8ff3 Merge remote-tracking branch 'origin/master' 2020-08-05 10:27:31 +02:00
Anders c347e618fa Fixed Layout 2020-08-05 10:27:07 +02:00
Neerholt 5fa22d748a phone number and admin name 2020-08-05 10:22:10 +02:00
frederikpyt 5f08267ec5 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-08-05 10:12:12 +02:00