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 |
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 |
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
|
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
|
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 |
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 |
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
|
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
|
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
|
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
|
d4e439a39b
|
Fixed css
|
2020-08-05 08:45:29 +02:00 |
frederikpyt
|
072c5c65ab
|
Fixes and todo's
|
2020-08-05 08:10:38 +02:00 |
frederikpyt
|
c04f26eaa7
|
fixes
|
2020-08-04 17:45:10 +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
|
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 |
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
|
20d73c047f
|
Fixed date and stuff
|
2020-08-03 14:47:06 +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 |
Anders
|
01f9502653
|
Removes - Console.log in feedback(s)
|
2020-08-03 13:44:53 +02:00 |
Neerholt
|
e8f6c2242a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
|
2020-08-03 13:21:56 +02:00 |
Neerholt
|
e2847e9959
|
Fixed PageNation
|
2020-08-03 13:21:47 +02:00 |
frederikpyt
|
a66b7aad92
|
Fixes
|
2020-08-03 12:57:14 +02:00 |
Anders
|
ffb347b51d
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 10:37:04 +02:00 |
Anders
|
b4263d8891
|
Fixed - Password & Confirm Password in create user now need to be the same.
Added new "see password" function on all password sites.
Fixed bugs
|
2020-08-03 10:36:57 +02:00 |
Neerholt
|
d7c4f2052b
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts:
skolehjem/routes/web.php
|
2020-08-03 10:09:54 +02:00 |
Neerholt
|
84cd760b0f
|
Made ris ros filter
|
2020-08-03 10:08:03 +02:00 |
Anders
|
1f5660001e
|
Fixed - Being able to change credentials without removing password
Added - Checking if the password is the same to confirm password in admin
|
2020-07-31 11:14:24 +02:00 |
Anders
|
d8ff713b90
|
Added "see password" button in admin - With CSS & Script (Script in file) - Edited form style and input styles
|
2020-07-31 10:38:10 +02:00 |
frederikpyt
|
38f8bfa0c9
|
Fixed bugs
|
2020-07-30 15:25:37 +02:00 |
frederikpyt
|
cf4559874a
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-30 10:12:00 +02:00 |
frederikpyt
|
06346d9675
|
Fixed css and created the washing reservation index for app
|
2020-07-30 10:11:52 +02:00 |
Anders
|
0ab41524c6
|
Added an account page for admin site
|
2020-07-30 08:42:01 +02:00 |
victor
|
4826725e07
|
Made washing-reservations search
|
2020-07-29 15:27:07 +02:00 |
frederikpyt
|
13c2e56e34
|
Filter search css
|
2020-07-29 13:58:19 +02:00 |
frederikpyt
|
657acbd6eb
|
Added User on washing reservation show
|
2020-07-29 13:43:18 +02:00 |
frederikpyt
|
faec1f66c5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-29 11:53:46 +02:00 |
frederikpyt
|
569ace008a
|
Permission fixes and washing reservation fixes
|
2020-07-29 11:53:37 +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
|
a90c9aa8cd
|
big smoke
|
2020-07-28 13:21:02 +02:00 |
victor
|
47a07c6174
|
Added no match found on live search
|
2020-07-28 11:31:39 +02:00 |
victor
|
2dba1fd8f7
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-28 11:07:41 +02:00 |
victor
|
c9cb3e99cd
|
Jeg er ikke sikker
|
2020-07-28 11:07:33 +02:00 |
Anders
|
8d8b5491c9
|
Removed unused/commented code
|
2020-07-28 10:17:00 +02:00 |
victor
|
9a5be4e280
|
Name fix for contact
|
2020-07-28 09:23:28 +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 |
victor
|
f1fb73beec
|
Fix css on live search, live search now works
|
2020-07-27 14:03:57 +02:00 |
frederikpyt
|
661d8a0f69
|
Fixed users and role implementation
|
2020-07-27 13:35:00 +02:00 |
frederikpyt
|
0c8cad9668
|
Fixed contacts
|
2020-07-27 13:34:45 +02:00 |
victor
|
2dd20ac85a
|
Semi fix live search
|
2020-07-27 13:07:19 +02:00 |
Sebastian Davaris
|
010322b605
|
Fixed frontend fuckup #3
|
2020-07-27 10:20:29 +02:00 |
Neerholt
|
9c17623518
|
Live search
|
2020-07-07 19:29:21 +02:00 |
frederikpyt
|
471a2897a5
|
Fixed redirect
|
2020-07-01 11:59:48 +02:00 |
Neerholt
|
4e69768ae8
|
Lavet controller og et forsøg på GUI
|
2020-07-01 11:46:29 +02:00 |
frederikpyt
|
9d757dc536
|
Fixed washing machine reservation, creation, edit and deletion
|
2020-07-01 11:38:09 +02:00 |
frederikpyt
|
2846dac2dc
|
Fixed Washing machine creation and editing
|
2020-07-01 10:30:28 +02:00 |
frederikpyt
|
6ecc96ef55
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:50:36 +02:00 |
frederikpyt
|
ca744a33e9
|
Removed feedback create button from admin dashboard
|
2020-07-01 09:50:29 +02:00 |
Neerholt
|
2b69938251
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:43:24 +02:00 |
Neerholt
|
7b4610f02f
|
Fix
|
2020-07-01 09:43:11 +02:00 |
frederikpyt
|
6b294972e4
|
Fixed admin dashboard current user label
|
2020-07-01 09:39:10 +02:00 |
frederikpyt
|
ff54108201
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-07-01 09:28:03 +02:00 |
frederikpyt
|
47daff173c
|
Added "no role" option when updating and creating a user
|
2020-07-01 09:27:54 +02:00 |
frederikpyt
|
f0a203fbb2
|
Rearranged admin panel site navigation
|
2020-07-01 09:27:18 +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 |
frederikpyt
|
3aee5515b1
|
Added confirmation to row deletion
|
2020-06-30 14:09:11 +02:00 |
frederikpyt
|
9f8cf52008
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 13:22:10 +02:00 |
frederikpyt
|
9425f5e067
|
Fixed role implementation on user index
|
2020-06-30 13:22:02 +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 |
frederikpyt
|
2ab54da383
|
Fix
|
2020-06-30 12:13:49 +02:00 |
frederikpyt
|
c49080f366
|
Dynamic roles in user create/edit frontend
|
2020-06-30 12:07:38 +02:00 |
frederikpyt
|
b586eceea9
|
Fix
|
2020-06-30 12:01:25 +02:00 |
frederikpyt
|
cab97f1c0a
|
Fix
|
2020-06-30 11:58:00 +02:00 |
frederikpyt
|
778315ff0b
|
Fix
|
2020-06-30 11:56:31 +02:00 |
frederikpyt
|
4b4b2b68de
|
Fix
|
2020-06-30 11:54:17 +02:00 |
frederikpyt
|
27414ade79
|
Role implementation
|
2020-06-30 11:49:17 +02:00 |
frederikpyt
|
b08422c520
|
Various fixes
|
2020-06-30 11:38:28 +02:00 |
frederikpyt
|
df679536de
|
Role frontend
|
2020-06-30 11:31:12 +02:00 |
Vedde
|
8415338120
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:57:36 +02:00 |
Vedde
|
5b36a52320
|
worked on ResourceExtensionController.php
|
2020-06-30 10:57:25 +02:00 |
frederikpyt
|
2a63600135
|
Fixes
|
2020-06-30 10:46:49 +02:00 |
frederikpyt
|
aea1b0af04
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 10:19:08 +02:00 |
frederikpyt
|
c074f32bbe
|
Fixes and implementation of forgot password
|
2020-06-30 10:19:01 +02:00 |
Sebastian Davaris
|
358b218d23
|
Finished security middlewarez
|
2020-06-30 10:04:06 +02:00 |
Sebastian Davaris
|
620902d7d8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:53:44 +02:00 |
Vedde
|
3b2fec0e09
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:52:20 +02:00 |
Vedde
|
66e8b2e3d8
|
Modified EventController.php.
|
2020-06-30 08:52:11 +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 |
Sebastian Davaris
|
4a0840b104
|
Modified base.blade.php?
|
2020-06-30 08:24:29 +02:00 |
frederikpyt
|
2f22ae275e
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-30 08:23:14 +02:00 |
frederikpyt
|
2562c69c36
|
Fixed delete on indexes
|
2020-06-30 08:23:07 +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 |
frederikpyt
|
c803d12299
|
Frontend support for role selection in user create, read and update.
|
2020-06-30 08:03:42 +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 |
Vedde
|
7234304496
|
worked on event blade files.
|
2020-06-29 14:48:31 +02:00 |
Sebastian Davaris
|
eb749e58a5
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 14:28:17 +02:00 |
Anders
|
45a7302640
|
Removed unnecessary code from StaffController.php
|
2020-06-29 14:26:39 +02:00 |
frederikpyt
|
e329f3f383
|
Fixes
|
2020-06-29 14:11:15 +02:00 |
frederikpyt
|
7fb4920354
|
Fixes
|
2020-06-29 13:55:47 +02:00 |
frederikpyt
|
357c046e44
|
Fixes
|
2020-06-29 13:47:18 +02:00 |
frederikpyt
|
5e624d7561
|
Fixes
|
2020-06-29 13:38:05 +02:00 |
frederikpyt
|
c6ffa26baa
|
Fixes
|
2020-06-29 13:18:58 +02:00 |
frederikpyt
|
626dddbb06
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 13:07:28 +02:00 |
frederikpyt
|
f16018cb15
|
Kontakt frontend
|
2020-06-29 13:07:17 +02:00 |
Anders
|
9bc7369ffe
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:56:14 +02:00 |
Anders
|
f7786be665
|
Added Feedback index page + added routing in base.blade.php + Fixed routing in FeedbackController.php
|
2020-06-29 12:56:08 +02:00 |
Vedde
|
0306717822
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 12:54:56 +02:00 |
Vedde
|
4020fcf502
|
updated event migration and admin stuff
|
2020-06-29 12:53:08 +02:00 |
frederikpyt
|
8047e33ad3
|
Kontakt frontend
|
2020-06-29 12:45:27 +02:00 |
frederikpyt
|
04ad9f6d1c
|
Kontakt frontend
|
2020-06-29 12:35:24 +02:00 |
frederikpyt
|
79d6ffe52d
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:32:46 +02:00 |
frederikpyt
|
7d80b014c7
|
Kontakt frontend
|
2020-06-29 12:32:34 +02:00 |
Anders
|
91a34f3d08
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 12:29:30 +02:00 |
Anders
|
600bbe7746
|
Fixed routing and backend to staff section
|
2020-06-29 12:29:23 +02:00 |
frederikpyt
|
d37c0c63f6
|
Kontakt frontend
|
2020-06-29 12:24:45 +02:00 |
frederikpyt
|
30b31e0309
|
Kontakt frontend
|
2020-06-29 12:20:09 +02:00 |
Anders
|
f5cdf848a3
|
Added Staff section and routing + some backend (That should be checked out)
|
2020-06-29 11:57:11 +02:00 |
frederikpyt
|
137c12cbee
|
Kontakt frontend
|
2020-06-29 11:41:33 +02:00 |
frederikpyt
|
ad0f61dd51
|
Kontakt frontend
|
2020-06-29 11:38:18 +02:00 |
frederikpyt
|
78992f6a61
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 11:34:30 +02:00 |
frederikpyt
|
b198f830c3
|
Kontakt frontend
|
2020-06-29 11:34:21 +02:00 |
Vedde
|
7f7226e12d
|
"fixed" events migration
|
2020-06-29 11:05:07 +02:00 |
Anders
|
469c21645a
|
Added Event route in admins left navbar
|
2020-06-29 10:56:53 +02:00 |
frederikpyt
|
1863d953f8
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/menuplans/create.blade.php
|
2020-06-29 10:52:18 +02:00 |
frederikpyt
|
0f93f4ca97
|
Fixes
|
2020-06-29 10:50:04 +02:00 |
Anders
|
7120b85784
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 10:46:35 +02:00 |
Anders
|
246ae2235d
|
Removed Fredag-Søndag on menuplan
|
2020-06-29 10:46:28 +02:00 |
frederikpyt
|
e8f13d81ec
|
Contact frontend
|
2020-06-29 10:40:34 +02:00 |
frederikpyt
|
86bf8cbc6e
|
Contact frontend
|
2020-06-29 10:37:42 +02:00 |
frederikpyt
|
488995ca37
|
Contact frontend
|
2020-06-29 10:31:24 +02:00 |
Sebastian Davaris
|
03c609175d
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/layout/base.blade.php
skolehjem/resources/views/app/layout/base.blade.php
skolehjem/routes/web.php
|
2020-06-29 10:15:56 +02:00 |
Sebastian Davaris
|
c823bdd963
|
Added button to calendar.js
|
2020-06-29 10:14:47 +02:00 |
frederikpyt
|
d4abbfc189
|
Fixes
|
2020-06-29 10:12:58 +02:00 |
frederikpyt
|
6bdf7d3447
|
Fixes
|
2020-06-29 09:57:21 +02:00 |
Vedde
|
874f0064a1
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 09:19:57 +02:00 |
Vedde
|
354a5952a7
|
updated Externallink. Should be able to do crud
|
2020-06-29 09:19:43 +02:00 |
Sebastian Davaris
|
c1877cd180
|
DO NOT TOUCH MENUPLAN-STUFF!!!
|
2020-06-29 09:08:49 +02:00 |
Sebastian Davaris
|
0adc1ebf02
|
Added Contact-stuff
|
2020-06-29 08:50:50 +02:00 |
Anders
|
4eb2a29af9
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:47:09 +02:00 |
Sebastian Davaris
|
5be4b752d7
|
Finished Menuplan;)
|
2020-06-29 08:43:35 +02:00 |
Anders
|
0c3d6dab25
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:34:49 +02:00 |
Sebastian Davaris
|
4061b590cb
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts:
skolehjem/resources/views/admin/menuplans/edit.blade.php
skolehjem/resources/views/admin/menuplans/index.blade.php
skolehjem/resources/views/admin/menuplans/update.blade.php
|
2020-06-29 08:32:52 +02:00 |
Sebastian Davaris
|
66ddd32944
|
Working on MenuPlanController.php
|
2020-06-29 08:31:36 +02:00 |
Vedde
|
4576140d2f
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:31:27 +02:00 |
Neerholt
|
a7c3a54778
|
Data bliver nu vist på edit siden
|
2020-06-29 08:31:26 +02:00 |
Vedde
|
d33a89757d
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:30:48 +02:00 |
Vedde
|
b46f8f7b0a
|
changed route name and table data to show correct info
|
2020-06-29 08:30:31 +02:00 |
Neerholt
|
7588e05299
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 08:22:15 +02:00 |
Neerholt
|
b1ae0f0964
|
Fix edit siden
|
2020-06-29 08:22:07 +02:00 |
Anders
|
8987db9d31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/resources/views/admin/washing-reservations/index.blade.php
|
2020-06-29 08:19:55 +02:00 |
frederikpyt
|
09040f0a36
|
Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
|
2020-06-29 08:14:01 +02:00 |
frederikpyt
|
0ba866ec29
|
Fixes
|
2020-06-29 08:13:53 +02:00 |
Neerholt
|
7d13933ea7
|
Fix route link til edit på menuplan
|
2020-06-29 08:02:42 +02:00 |
Anders
|
f517e53557
|
Merge remote-tracking branch 'origin/master'
|
2020-06-29 07:54:41 +02:00 |
Vedde
|
578dd8d522
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# skolehjem/app/Http/Controllers/MenuPlanController.php
# skolehjem/resources/views/admin/external-links/index.blade.php
|
2020-06-26 13:56:47 +02:00 |
Vedde
|
89082b281b
|
added things to external link views and worked in controller
|
2020-06-26 13:56:28 +02:00 |
Sebastian Davaris
|
b56f3d2a34
|
Working on MenuPlanController.php
|
2020-06-26 13:55:04 +02:00 |
Sebastian Davaris
|
a84f1729f0
|
Fixed Vector 0x01
|
2020-06-26 13:17:18 +02:00 |
Neerholt
|
44e70232cd
|
Kinda Tryna fix
|
2020-06-26 13:11:24 +02:00 |
Anders
|
c6282b77d1
|
Renamed 'Booking' to 'Vaske Reservationer' in washing-reservations
|
2020-06-26 12:20:20 +02:00 |
Anders
|
400f2e563f
|
Removed ID From all admin sites.
Added washing-reservations under washing-machines instead of being alone
|
2020-06-26 12:17:46 +02:00 |
Anders
|
8569496d3d
|
Renamed Booking to Reservationer - Removed reused washing-reservations.index
|
2020-06-26 09:15:40 +02:00 |
Neerholt
|
659fe23bb7
|
Menu plan form fix
|
2020-06-26 08:20:43 +02:00 |
Neerholt
|
47f687d12c
|
idk kev
|
2020-06-25 18:43:46 +02:00 |
Neerholt
|
bbd9a26b91
|
Create pages fix
|
2020-06-25 16:16:08 +02:00 |