vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
674 Commits 3 Branches 0 Tags 707 MiB
Commit Graph

47 Commits

Author SHA1 Message Date
frederikpyt bb1aade947 v0.5.15h - Fixed bugs 2020-08-10 12:07:41 +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 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 bd7800f5a0 v0.5.15 - Added subname to news 2020-08-10 09:37:19 +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
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 7cc871ae90 v0.5.7 - Made multi language option 2020-08-06 15:31:38 +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
Anders 2edfd71de9 Session message on fail - Users / Roles / Events 2020-08-04 09:34:56 +02:00
Anders 90b58a8586 Fixed - Redirect in Event controler 
Fixed - orderBy function when searching, in Event & Feedback
 2020-08-03 10:46:48 +02:00
Anders 1d63879117 Added "orderBy" function to event and feedback. 2020-08-03 08:46:38 +02:00
victor 26c28d8e54 Made filter search 2020-07-29 09:49:54 +02:00
Anders fd3f2de668 Merge remote-tracking branch 'origin/master' 2020-07-28 14:54:26 +02:00
Anders 556e6cf25a You are now able to remove people who have signed up for events - With routing etc. 2020-07-28 14:54:19 +02:00
victor 63f2cc31d9 Fix live search again 2020-07-28 14:23:54 +02:00
victor f6d762ba46 Revert "Added no match found on live search" 
This reverts commit 47a07c61
 2020-07-28 13:21:22 +02:00
victor 47a07c6174 Added no match found on live search 2020-07-28 11:31:39 +02:00
Neerholt 519bd70ace
Merge branch 'master' into LiveSearch 2020-07-27 14:23:13 +02:00
victor b9633d36a9 Made Live search is done 2020-07-27 16:03:49 +02:00
Vedde 32a7e3d3d0 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-01 11:29:58 +02:00
Vedde 9f48d2372f added a few comments 2020-07-01 11:29:45 +02:00
Neerholt 7b4610f02f Fix 2020-07-01 09:43:11 +02:00
Vedde 5b36a52320 worked on ResourceExtensionController.php 2020-06-30 10:57:25 +02:00
Sebastian Davaris 14b745dc2b Added more permissions to the seeder.. 2020-06-30 09:21:21 +02:00
Vedde 66e8b2e3d8 Modified EventController.php. 2020-06-30 08:52:11 +02:00
Vedde 7234304496 worked on event blade files. 2020-06-29 14:48:31 +02:00
Vedde 4020fcf502 updated event migration and admin stuff 2020-06-29 12:53:08 +02:00
Anders e6d9ddf7d8 Fixed EventController to go to Events instead of bookings 
Added app->events->index page (needed backend and a foreach loop (foreach event do...))

Changed name in menu 'Vaske Booking Liste' to 'Reservationer'
 2020-06-26 08:56:18 +02:00
Sebastian Davaris 47161e2615 Working on calendar.js 2020-06-25 08:28:36 +02:00
Sebastian Davaris 39ecd64d04 Calendar stuff. 2020-06-24 08:54:56 +02:00
Sebastian Davaris 79af2dee20 Fixed Controller dependencies. 2020-06-24 08:23:15 +02:00
Vedde dbe6a4dcfe changed return view to Response::detect on controllers 2020-06-23 08:15:44 +02:00
Sebastian Davaris 3a345b1417 Fixed Routes and blades. 2020-06-22 14:53:00 +02:00
Sebastian Davaris e056567f57 Fixed UserController.php 2020-06-19 08:15:24 +02:00
Sebastian Davaris 06bab0a120 Working on controllers 2020-06-18 08:01:42 +02:00
Vedde 2cbc1ddaf9 added user folder/view 
updated EventController.php & web.php
 2020-06-10 08:33:06 +02:00
Vedde fa6fdcd690 Added a few models and migrations 2020-06-09 10:45:16 +02:00
Vedde 7eaa3311cb Merge branch 'master' of C:\Users\vedr0021\PhpstormProjects\skolehjem-webapp with conflicts. 2020-06-09 09:05:07 +02:00