Commit Graph

398 Commits

Author SHA1 Message Date
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 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
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 86536ba978 v0.5.17 - Made some small css changes to guides layout 2020-08-10 13:26:48 +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 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
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 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 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
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 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 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 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