Commit Graph

62 Commits

Author SHA1 Message Date
frederikpyt bb1aade947 v0.5.15h - Fixed bugs 2020-08-10 12:07:41 +02:00
frederikpyt bd7800f5a0 v0.5.15 - Added subname to news 2020-08-10 09:37:19 +02:00
Anders 8388fecfb6 v0.5.12b - Fixed description of events (string to longText) 2020-08-07 13:00:37 +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
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 3e4e6e71ab v0.5.5 - Added news on the admin panel 2020-08-06 12:21:19 +02:00
frederikpyt 5452711665 v0.5.3 - Added Locations and a location_id to washing machines 2020-08-06 08:37:16 +02:00
Anders a78e7d90f6 Fixed - Guides
Added - contacts visual (controller coming soon)
2020-08-05 09:23:57 +02:00
Anders 0e72166ac4 Removed External Links 2020-08-04 15:20:56 +02:00
frederikpyt 2a3a728fa3 fixes 2020-08-04 14:27:11 +02:00
frederikpyt 9d52e2e621 fixes 2020-08-04 14:23:07 +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 9ed3faedfe fixed table name guideArticles -> guide_articles 2020-08-04 13:35:16 +02:00
Neerholt c223cb967c Made it so they can now make there own dynamic guide 2020-08-04 13:21:23 +02:00
frederikpyt a66b7aad92 Fixes 2020-08-03 12:57:14 +02:00
frederikpyt 569ace008a Permission fixes and washing reservation fixes 2020-07-29 11:53:37 +02:00
Anders 80725dee12 Made it possible to sign up for events.
Added fail and success messages when signing up.
Fixed unique keys in migrate
2020-07-28 10:13:44 +02:00
Vedran Zelen 67ae7746a3 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-07-28 08:34:58 +02:00
Vedran Zelen b89c1509fe Added comments for easier understanding. 2020-07-28 08:34:10 +02:00
Sebastian Davaris fb65c1b9fc Added UserEvent.php 2020-07-28 08:18:45 +02:00
frederikpyt 0c8cad9668 Fixed contacts 2020-07-27 13:34:45 +02:00
Sebastian Davaris 79e5e95695 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/public/css/admin.css
2020-07-27 08:25:42 +02:00
Sebastian Davaris a755fd9680 Working on ResourceController.php again.. 2020-07-27 08:24:16 +02:00
frederikpyt 9d757dc536 Fixed washing machine reservation, creation, edit and deletion 2020-07-01 11:38:09 +02:00
Vedde cb927b9637 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/routes/web.php
2020-07-01 09:13:43 +02:00
Vedde 54a0fd0997 Added resource category migration and empty blade files 2020-07-01 09:08:33 +02:00
Anders dfd8420270 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	skolehjem/app/MenuPlan.php
2020-06-30 12:40:02 +02:00
Anders 394b8551c8 Edited menuplan - Can now be seen by users 2020-06-30 12:38:02 +02:00
Neerholt 3fe0b1e6e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 11:30:21 +02:00
Neerholt 6c020e36da Made role controller, added index and create 2020-06-30 11:30:12 +02:00
Vedde f0132bee2c worked on ResourceExtensionController.php and added resource_extension migration 2020-06-30 11:27:39 +02:00
frederikpyt 2814490a8a Merge remote-tracking branch 'origin/master' 2020-06-30 09:19:56 +02:00
frederikpyt af228f705d Removed unnecessary files 2020-06-30 09:19:35 +02:00
Sebastian Davaris 620902d7d8 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:53:44 +02:00
frederikpyt 8445a22732 Created files for gallery 2020-06-30 08:52:46 +02:00
Neerholt fd87e133e9 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-30 08:50:14 +02:00
Neerholt 20bfcb2c97 Made gallery, video, album, migrations 2020-06-30 08:50:04 +02:00
Sebastian Davaris f638777878 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/database/migrations/2020_06_23_070657_create_menu_plans.php
	skolehjem/resources/views/admin/users/index.blade.php
2020-06-30 08:25:18 +02:00
Anders d6a9aa0c4f Merge remote-tracking branch 'origin/master' 2020-06-30 08:21:45 +02:00
Anders c732d8eec0 Fixed menuplan create 2020-06-30 08:21:36 +02:00
Sebastian Davaris 4d35b368c6 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 14:50:08 +02:00
Sebastian Davaris 988ceb7c8a Fixed error AND 0x01 2020-06-29 14:49:57 +02:00
Vedde a3209bc422 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
 Conflicts:
	skolehjem/app/Http/Controllers/ContactController.php
2020-06-29 14:48:53 +02:00
Anders 6441a8838a Added a new column to feedbacks 2020-06-29 13:30:13 +02:00
Anders b942d8c1e1 Updated create_staff_table 2020-06-29 13:29:19 +02:00
Neerholt b48907b523 Made staff migrate 2020-06-29 13:27:48 +02:00
Vedde 0306717822 Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp 2020-06-29 12:54:56 +02:00
Vedde 7b691b8c94 added event migration 2020-06-29 12:54:43 +02:00