Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make navbar scrollable #1490

Open
wants to merge 349 commits into
base: wip
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
349 commits
Select commit Hold shift + click to select a range
0857bd4
Remove unused function getenv_default()
mosen Jul 19, 2020
a05c6b9
Fix invalid reference in ModuleServiceProvider.php
mosen Jul 19, 2020
1873c9b
Provide test for datatables API
mosen Aug 14, 2020
abd9199
Add new migrations for new BusinessUnit and MachineGroup schema
mosen Aug 14, 2020
5129a91
Temporarily disable authorization gates because they are locking out …
mosen Aug 16, 2020
7382c87
Dropping GraphQL (lighthouse) and graphql-playground as out-of-scope …
mosen Oct 10, 2020
2d22006
user facing notes about upgrading
mosen Oct 10, 2020
9168d1b
apply machine and business unit policies
mosen Oct 11, 2020
4de5afc
Update ReportController.php
bochoven Oct 11, 2020
4e1b7bd
Update AdminController.php
bochoven Oct 25, 2020
5eded02
Update LoginRoleDecider.php
bochoven Oct 25, 2020
6f2ed23
Add MachineGroupMembership listener
bochoven Oct 25, 2020
093cb33
Update LoginRoleDecider.php
bochoven Oct 25, 2020
14acd47
Update site_helper.php
bochoven Oct 25, 2020
314f4b5
Update LoginRoleDecider.php
bochoven Oct 25, 2020
38cbccd
Update web.php
bochoven Oct 25, 2020
d225e0a
Update head.php
bochoven Oct 25, 2020
3090ff9
Update web.php
bochoven Oct 25, 2020
9c0446c
Update LoginRoleDecider.php
bochoven Oct 25, 2020
bbfde7a
Update MachineGroupMembership.php
bochoven Oct 25, 2020
a534d79
Update web.php
bochoven Oct 25, 2020
6ccd527
Update FilterController.php
bochoven Oct 25, 2020
458fcf2
Update web.php
bochoven Oct 25, 2020
be5580f
Fix module loading
bochoven Oct 29, 2020
8e669b9
Fix online migrations
bochoven Nov 1, 2020
597b778
Remove composer merge plugin as it is deprecated
bochoven Nov 1, 2020
258b5e0
Update docker for composer 2.x
bochoven Nov 2, 2020
c16a8e9
Update docker file to allow log
bochoven Nov 2, 2020
9f536d8
Update dockerfile
bochoven Nov 2, 2020
cdcf286
Update Dockerfile
bochoven Nov 21, 2020
add6d8a
Add module search path to example
bochoven Nov 25, 2020
440221f
using php.ini-production and configure php upload settings (#1404)
b-reich Mar 17, 2021
430bff9
add basic GitHub workflow to replace TravisCI
mosen Mar 25, 2021
fddb7b0
try the GitHub action template for Laravel testing
mosen Mar 25, 2021
cc786b1
try specifying the branch name to run against
mosen Mar 25, 2021
2961635
replace fzaninotto/faker which is abandoned, with fakerphp/faker
mosen Mar 25, 2021
ae3fd2f
convert client.client_detail view into blade view clients.detail
mosen Mar 25, 2021
ae3932d
create a blade template for install/install which is currently throwi…
mosen Mar 26, 2021
de193f6
add a diagram of current auth flow/events
mosen Mar 26, 2021
366dd02
Create base class AuthorizationTestCase.php to simulate access for al…
mosen Mar 26, 2021
a1555cd
GitHub Actions - Add cache action back in, Use `please` script to gen…
mosen Mar 26, 2021
a55f837
GitHub Actions - Run migrations against MariaDB container
mosen Mar 26, 2021
5f015b4
GitHub Actions - Use randomised host port
mosen Mar 26, 2021
16bdc15
GitHub Actions - Try migrations again using static root pwd
mosen Mar 26, 2021
562cf5c
GitHub Actions - Not possible to run migrations without .env
mosen Mar 26, 2021
4cfa6db
GitHub Actions - Adjust migrations env
mosen Mar 26, 2021
bc8fe25
GitHub Actions - Add special phpdotenv for CI mode
mosen Mar 26, 2021
888cb4e
Update several dependencies based upon the requirements of a new Lara…
mosen Mar 26, 2021
571bf51
Fixed an issue running legacy migrations via the FakeCapsule: you mus…
mosen Mar 27, 2021
7f2df04
Foreign key references to Eloquent ID's must be BIGINTs
mosen Mar 27, 2021
60c0ce1
Only seed database with Fake data if you specifically call the FakeSe…
mosen Mar 28, 2021
08b323f
Hella ugly copy and paste implementation of Gate::authorize() until w…
mosen Mar 28, 2021
07ceaff
Implement gate based hiding of Archive button in clients/detail
mosen Mar 28, 2021
96195f4
Add a memberships helper method to legacy BusinessUnit.php
mosen Mar 28, 2021
a0a6643
Apply proper gates to authorized $what argument.
mosen Mar 28, 2021
e0be3f0
Add PHPstan to check type annotations
mosen Mar 29, 2021
ba27af7
Add table `users_contact_methods` to store contact addresses for Noti…
mosen Apr 3, 2021
defde1d
Add user admin link to head partial AND mr.blade.php layout
mosen Apr 3, 2021
3ccceae
Add component UserForm.vue for user editing
mosen Apr 3, 2021
eba6b10
Add Vue dependencies using global CDN to mr layout for now, as we are…
mosen Apr 4, 2021
62e7ac7
Clean up Datatables controller
bochoven Apr 4, 2021
e17cb83
Fix Request for local php
bochoven Apr 4, 2021
adde1cd
Remove NOAUTH authentication from everything
mosen Apr 9, 2021
c2feeea
Remove MultiAuthGuard.php/NoAuthGuard.php which were earlier attempts…
mosen Apr 9, 2021
4d393f9
Remove NOAUTH from .env.example
mosen Apr 9, 2021
2e515fd
Remove auth middleware from constructors of controllers and make sure…
mosen Apr 9, 2021
3b78d14
Move admin routes into their own file
mosen Apr 9, 2021
ce05698
Complete reimplementation of the `archive` authorization using Larave…
mosen Apr 9, 2021
396947d
Quick test of a teams notification working.
mosen Apr 9, 2021
553c484
Put composer merge plugin back in
mosen Apr 9, 2021
fe39693
Move migrations from munkireport/machine into core
mosen Apr 12, 2021
524dcff
Fix imports of Reportdata_model and Machine_model using the root name…
mosen Apr 12, 2021
706d963
Core widgets are back. Module widgets were being registered twice, an…
mosen Apr 12, 2021
3e9cd15
Moved a bunch of Eloquent scope traits into App\ for usage by models
mosen Apr 12, 2021
17600ea
Convert `json` KISSMVC template view to response()->json() in Machine…
mosen Apr 12, 2021
6c57bf5
Remove useless DocBlocks
mosen Apr 12, 2021
bc95d84
Switch some ReportDataController.php histogram queries over to Carbon…
mosen Apr 12, 2021
ee7cb88
Comments
mosen Apr 12, 2021
d282b36
Create Laravel Middleware "ClientPassphrase" to implement the client_…
mosen Apr 13, 2021
400dff7
Add example responses in DocBlocks so I can check against what is cur…
mosen Apr 13, 2021
ac7caf6
Renamed ModuleServiceProvider.php to ModulesServiceProvider.php so th…
mosen Apr 14, 2021
4772ad5
Add trait ProvidesHistogram.php to ReportData and Machine. Histogram …
mosen Apr 14, 2021
c4fc8ff
Update DataTables to 1.10.24 (#1410)
MagerValp Apr 14, 2021
721bd81
.dockerignore composer local overrides
mosen Apr 17, 2021
ce59e79
create a Processor contract which encompasses the interface used for …
mosen Apr 17, 2021
fc0bd58
put GraphQL back into v6 due to popular demand.
mosen Apr 17, 2021
afdbd96
Ignore node_modules in docker builds
mosen Apr 17, 2021
4417ccf
ClientsController.php - no need to order a single result.
mosen Apr 17, 2021
7735ce4
Update Laravel provided version of Bootstrap from 4.5 to 4.6
mosen Apr 18, 2021
2803d58
Fix version footer not being a fluid container
mosen Apr 18, 2021
cb1ae2d
Make login layout look exaclty like the MR6 authenticated navigation …
mosen Apr 18, 2021
fae3c90
Put Laravel Sanctum back for API Keys issued to GraphQL and other APIs
mosen Apr 22, 2021
97ed9a8
Add experimental dashboards v2 controller which is enabled by env ALP…
mosen Apr 25, 2021
2d9df16
Dashboards v2 layout compiles at least
mosen Apr 25, 2021
b5ba064
Add i18next + vue-i18next to Vue app.js. I18n is still broken though
mosen Apr 27, 2021
e03573d
One step closer to delete machine working by fixing the route and cli…
mosen Apr 27, 2021
dcb938d
Remove MariaDB fixture from GitHub Actions for now.
mosen Apr 27, 2021
3aff1ea
Upgrade phpunit.xml to latest schema version
mosen Apr 27, 2021
3a41c5b
Make clients/get_data backwards compatible to satisfy older javascrip…
mosen Apr 27, 2021
83c86b2
Fix a few more text decorations on widget list button (core modules o…
mosen Apr 27, 2021
9f7c02e
Make filter modal look less terrible (updated for bs4)
mosen May 15, 2021
a498b67
Update layout for BU admin to fit bs4 (work in progress)
mosen May 15, 2021
c8d2e88
Update CHANGELOG
bochoven May 21, 2021
a1c3724
Release version 6.0.0-beta.1.
bochoven May 21, 2021
135fee7
Bumping to v6.0.0 for development.
bochoven May 21, 2021
e7b92a5
Add CloudFormation stack to deploy MunkiReport PHP on ECS/fargate wit…
mosen Jul 18, 2021
5f463c9
Add password resets to skip tables
bochoven Aug 24, 2021
74bc961
Change deprecated maintainer
bochoven Aug 24, 2021
6a9528a
Add github registry workflow
bochoven Aug 24, 2021
333dd9f
Fix docker entrypoint
bochoven Aug 24, 2021
f2ed24d
Change apache port to 8080
bochoven Aug 25, 2021
935c953
Fix naming of dataTables css
bochoven Aug 25, 2021
fa8844d
Change WEBHOST to APP_URL for compatibility
bochoven Aug 25, 2021
112e40a
Use APP_URL to generate urls
bochoven Aug 25, 2021
eacedda
Add baseurl to saml2 config
bochoven Aug 27, 2021
52be8ba
Add popper.js
bochoven Aug 31, 2021
4033c87
Add README about the AWS ECS + SQLite option
mosen Jan 4, 2022
2d61cb9
Global search is held behind a feature toggle `munkireport.alpha_feat…
mosen Jan 4, 2022
4d2e618
Add a Locales controller to support ajax fetch of i18next locales
mosen Jan 4, 2022
25f8e58
Start supporting the alpha dashboard layout by creating Vue equivalen…
mosen Jan 4, 2022
44b8bc3
Merge pull request #1427 from mosen/feature/dashboard7
mosen Jan 4, 2022
03e23a7
Update PHPass dependency to new maintainer until we know impact.
mosen Jan 4, 2022
90806e2
Merge pull request #1428 from mosen/hotfix/phpass
mosen Jan 4, 2022
312ff14
Update core components for Laravel ^8.0 as per https://laravel.com/do…
mosen Jan 4, 2022
0ba5392
Begin documenting process for upgrade
mosen Jan 4, 2022
c6b460b
Add dependency laravel/legacy-factories to support non-class based se…
mosen Jan 4, 2022
c446fd7
Update 3rd party dependencies in line with Laravel 8
mosen Jan 4, 2022
7582043
Add Larastan to aid in detecting type issues
mosen Jan 4, 2022
7154207
Merge pull request #1429 from mosen/feature/laravel8
mosen Jan 4, 2022
af9e0f2
Use python3 selection criteria from outset
mosen Jan 4, 2022
42aa57e
Run `2to3 -w public/assets/client_installer`
mosen Jan 5, 2022
e5a8215
phpserialize.py: def await() clashes with reserved keyword `await`, r…
mosen Jan 5, 2022
7999bc2
Update all code in munkilib/ that came from munki itself to the lates…
mosen Jan 5, 2022
d8e04db
phpserialize.py: support encoding of python3 strings which are suppli…
mosen Jan 5, 2022
1483b5b
constants.py: adjust bundle identifier back to MunkiReport from Manag…
mosen Jan 5, 2022
eb045e1
Merge pull request #1430 from mosen/feature/install_py3
mosen Jan 5, 2022
5551c38
Update all faker factories to the Laravel 8 class style.
mosen Jan 6, 2022
e89833c
Backed out FakerDataStore as it seemed to be unfinished
mosen Jan 6, 2022
098bc90
AuthServiceProvider.php gives more context in logs when admin check f…
mosen Jan 7, 2022
5dba346
Merge pull request #1431 from mosen/hotfix/unit_test_403_authz
mosen Jan 7, 2022
6288623
Update all frontend components based upon the upstream laravel 8 temp…
mosen Jan 9, 2022
59f566d
Fix seeder namespaces
mosen Jan 9, 2022
b87154e
Make docker entrypoint display warning if APP_URL is not set
mosen Jan 9, 2022
02cc679
Merge pull request #1432 from mosen/hotfix/wip_patching
mosen Jan 9, 2022
9fa5c87
Replace abort() with response() helper in some places as it is more c…
mosen Jan 11, 2022
46c8894
Merge pull request #1433 from mosen/feature/package_discovery
mosen Jan 11, 2022
265bb53
Update purl.py to store response as "data" aka bytes not str(), which…
mosen Jan 11, 2022
42f2677
Merge pull request #1434 from mosen/hotfix/purl_python3_bytestring
mosen Jan 11, 2022
f65963c
Replace munkireport unserializer with xKerman safe unserializer packa…
mosen Jan 12, 2022
92a76b9
Moved client routes into their own folder, so the client inventory lo…
mosen Jan 14, 2022
3b45ca9
Use package xkerman/restricted-unserialize instead of built-in munkir…
mosen Jan 14, 2022
a6e7af7
Show a log warning if anyone is still using Unserializer.php
mosen Jan 14, 2022
c60e92c
Merge pull request #1435 from mosen/hotfix/safe_unserializer
mosen Jan 14, 2022
cf33410
Update registry action to use GITHUB_TOKEN which is the new best prac…
mosen Jan 14, 2022
67e7f50
Merge pull request #1436 from mosen/hotfix/github-actions-pkg
mosen Jan 14, 2022
6493807
colors pkg broken by author
mosen Jan 14, 2022
02b567a
colors pkg broken by author
mosen Jan 14, 2022
686d8a0
Merge pull request #1437 from mosen/hotfix/github-actions-pkg
mosen Jan 14, 2022
eae6b74
Merge pull request #1380 from joncrain/master
mosen Jan 14, 2022
a067219
minor additions to systeminfo controller which could take over from S…
mosen Jan 15, 2022
1072a12
Merge pull request #1438 from mosen/feature/legacy_view_updates
mosen Jan 15, 2022
f3fa115
ClientsController.php uses firstOrFail instead of the client_dont_exi…
mosen Jan 17, 2022
09cbecb
Replace kissmvc view install_plist.php with install/plist
mosen Jan 17, 2022
afa3c44
Merge pull request #1439 from mosen/feature/widget_components
mosen Jan 17, 2022
0ea1054
Add SearchController for submitting searches for each model type.
mosen Jul 18, 2021
2127a14
Merge pull request #1440 from mosen/feature/scout_search_cherry_pick
mosen Jan 17, 2022
a5b2d96
Add facade accessors for Dashboards and Widgets
mosen Jan 18, 2022
7c24a9b
Merge pull request #1441 from mosen/feature/yaml_widget_components
mosen Jan 18, 2022
8d9a1c6
Move compatibility providers to their own section for clarity
mosen Jan 18, 2022
8f5eec1
LoginRoleDecider.php can use email addresses as the user principal fo…
mosen Jan 19, 2022
bceff33
Import and convert tag module to core.
mosen Jan 19, 2022
a2e730d
Merge pull request #1442 from mosen/feature/cleanup
mosen Jan 19, 2022
fa21298
Merge pull request #1443 from mosen/feature/tag_merge
mosen Jan 19, 2022
d7ac144
Import and convert comment module to core.
mosen Jan 19, 2022
0b94f87
Merge pull request #1444 from mosen/feature/comment_merge
mosen Jan 19, 2022
1290594
Import and convert event module to core.
mosen Jan 19, 2022
cbbec34
Merge pull request #1445 from mosen/feature/event_merge
mosen Jan 19, 2022
2cf4367
Remove redundant framework/down code from ReportController.php
mosen Jan 20, 2022
949b060
Merge pull request #1446 from mosen/feature/v6_module_loading
mosen Jan 20, 2022
d35940d
Add vue-apollo and peer deps to frontend for GraphQL frontend demo
mosen Jan 22, 2022
e39adc4
Merge pull request #1447 from mosen/feature/gql_query
mosen Jan 22, 2022
89c07be
Add support for OpenID Connect/OAuth2 SSO via Socialite.
mosen Jan 22, 2022
806142e
Merge pull request #1448 from mosen/feature/azure_ad_oidc
mosen Jan 22, 2022
33f3870
Replace sess_get helper with session() helper from laravel
mosen Jan 23, 2022
9bd2451
Add deprecation logging to deprecated API's with opt-in log file
mosen Jan 23, 2022
0413c93
Merge pull request #1449 from mosen/feature/legacy_code_hunt
mosen Jan 23, 2022
f9b124b
Move most of the remaining v5 compatibility classes from MR\ namespac…
mosen Jan 24, 2022
3e868c9
Remove munkireport\models\Business_unit and replace with Compatibilit…
mosen Jan 24, 2022
78fcc0b
Remove munkireport\models\Hash and replace with App\Hash
mosen Jan 24, 2022
2f8c37c
Remove munkireport\models\Reportdata_model and replace with App\Repor…
mosen Jan 24, 2022
d0e7c21
Fix invalid class name in CommentController.php
mosen Jan 25, 2022
b827098
Fix missing save() in MachineGroupsController.php
mosen Jan 25, 2022
bed0f3c
Merge pull request #1451 from mosen/feature/legacy_code_hunt2
mosen Jan 25, 2022
c6f9d99
Make AppController.php so that there is a landing page for SPA
mosen Jan 27, 2022
9ceb069
Move GraphQL schema types to their modules out of general schema
mosen Jan 27, 2022
1d1cad5
Merge pull request #1452 from mosen/feature/business_units_v2_draft
mosen Jan 27, 2022
0237d0f
Fix approx 160 PHPStan errors with the remainder needing further inve…
mosen Jan 30, 2022
15f9fcc
First rev FilterScope trait to implement filters as per MRQueryBuilder
mosen Jan 31, 2022
2630cb5
Fix machine delete RBAC when BU's are enabled. Added test cases for this
mosen Jan 31, 2022
c44a32c
Merge pull request #1453 from mosen/hotfix/phpstan_fixes
mosen Jan 31, 2022
e6dda86
Rename github workflows to describe their purpose
mosen Feb 13, 2022
dc99951
Remove pull-request.yml incomplete workflow for now so that we dont r…
mosen Feb 13, 2022
5fee9eb
Merge pull request #1458 from mosen/feature/github-actions-release
mosen Feb 13, 2022
ad29545
Ignore some step failures to continue developing workflow
mosen Feb 13, 2022
199cedd
Merge pull request #1459 from mosen/feature/github-actions-release
mosen Feb 13, 2022
03ddfcb
Add an ad-hoc build and upload workflow, to test artifact release bui…
mosen Feb 13, 2022
50407f7
Merge pull request #1460 from mosen/feature/github-actions-release
mosen Feb 13, 2022
b0a7dfe
Ignore laravel mix build output
mosen Feb 13, 2022
9610250
Incorrect structure for event `workflow_dispatch` in build-adhoc.yml
mosen Feb 13, 2022
e3b6f85
Let adhoc build run on push for a while to test
mosen Feb 13, 2022
5ff95e1
Switch to archive creation as recommended.
mosen Feb 13, 2022
8ee1830
Use release tag `wip` for untagged commits
mosen Feb 13, 2022
41b8689
Rename build-adhoc.yml to build and release WIP, because it now draft…
mosen Feb 13, 2022
ddc7c78
Split release actions into wip or prod tagged action
mosen Feb 13, 2022
7575b31
Move js dependencies out of devDependencies unless they are actually …
mosen Feb 13, 2022
c3685ef
Add npm caching to wip release action
mosen Feb 13, 2022
1ad672f
Disable action to build wip on push
mosen Feb 13, 2022
758b467
Move docker builds into release workflows, either wip or prod (release)
mosen Feb 13, 2022
b4506dd
Merge pull request #1461 from mosen/wip
mosen Feb 13, 2022
bba2fed
Make github action release name the same as the manual process.
mosen Feb 14, 2022
7cab50a
Merge pull request #1462 from mosen/wip
mosen Feb 14, 2022
198cd2f
Remove python3 detection from install script
bochoven May 7, 2022
22d936c
Update python3 hashbang
bochoven May 7, 2022
adf70b8
Build wip image on push
bochoven May 7, 2022
b6e13dc
Fix yaml
bochoven May 7, 2022
d926609
Use py3 for ard and bluetooth
bochoven May 8, 2022
5d9915a
Update disk_report to py3
bochoven May 8, 2022
776a448
Update modules to py3
bochoven May 8, 2022
7fe7efb
Update model_lookup_helper path
bochoven May 8, 2022
51d4afa
Update munkireport module to py3
bochoven May 8, 2022
0186623
Skip wip builder
bochoven May 8, 2022
1af09d4
Update composer
bochoven May 8, 2022
5d3fedb
Update logging.php
bochoven May 20, 2022
a9d32ef
Remove the firewall package
bochoven Jun 12, 2022
f086e75
Add note about firewall removal
bochoven Jun 12, 2022
5b9b95f
Removing network module
bochoven Jun 12, 2022
e6b924e
Make zip file naming and release notes more similar to the manual pro…
mosen Sep 14, 2022
89d7320
Merge branch 'wip' of https://github.com/munkireport/munkireport-php …
mosen Sep 14, 2022
f1d0a1d
Laravel 9 - base package updates
mosen Sep 14, 2022
496874e
Reconcile some differences from Laravel 9 app skeleton to current mun…
mosen Sep 27, 2022
298a032
Update laravel-mix to laravel-vite-plugin using migration guide.
mosen Oct 9, 2022
dbfbd5c
Very rough notes about steps taken to upgrade to Laravel 9 which need…
mosen Oct 13, 2022
850a2da
Added vite plugins for self-signed certs in local dev, vue template t…
mosen Oct 16, 2022
1df6f59
Added a wait to the php entrypoint just in case MariaDB does not come…
mosen Nov 20, 2022
73508ad
Replace outdated GitHub Actions
mosen Nov 20, 2022
9235268
A bug in the local admin seed script prevented restarts of containers…
mosen Nov 20, 2022
cba1f2c
Add command config:debug to show effective database configuration ins…
mosen Nov 21, 2022
b586ca6
Reinstate earlier logic for determining correct python3 interpreter, …
mosen Nov 21, 2022
0930d57
reinstated filters in /install/get_paths so synology/hfs forks arent …
mosen Nov 21, 2022
99b3461
Make navbar scrollable
Guillon88 Nov 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update laravel-mix to laravel-vite-plugin using migration guide.
Notes about failing tests
Make docker build work again
Move webpack out of the way but still needed to refer to copy tasks
mosen committed Oct 9, 2022
commit 298a03298d8b0d3bb49c46dde486205fb6eba7ef
4 changes: 2 additions & 2 deletions .env.ci
Original file line number Diff line number Diff line change
@@ -234,5 +234,5 @@ PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -243,8 +243,8 @@ PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1

MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

## Sanctum (API Keys)
# These domains can use cookies instead of API keys to authenticate to the API. Typically you want that to include
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ vendor/*
composer.lock
.env
composer.local.*
docker-compose.yml

local/users/*.yml
local/dashboards/*.yml
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ COPY . /usr/src/app
WORKDIR /usr/src/app
RUN npm install && npm run production

FROM php:7.4-apache
FROM php:8.1-apache
LABEL maintainer="MunkiReport PHP Team <munkireport@noreply.users.github.com>"
LABEL architecture="x86_64" \
io.k8s.display-name="MunkiReport" \
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ System Requirements
### Serverside:

* A webserver (runs fine with Apache, IIS and nginx)
* php version 7.2.5 or higher with pdo-sqlite3 and libxml
* php version 8.1 or higher with pdo-sqlite3 and libxml

### Clientside

@@ -77,7 +77,7 @@ MunkiReport makes use of these fine software packages:
* [Datatables](http://datatables.net) table display
* [nvd3](https://github.com/nvd3-community/nvd3) for graphs
* [Moment.js](http://momentjs.com) for displaying time
* [Bootstrap 3.0](http://getbootstrap.com) the main webframework
* [Bootstrap 4.6](http://getbootstrap.com) the main webframework
* [Font Awesome](http://fortawesome.github.io/Font-Awesome/) for icons
* [adLDAP](https://github.com/Adldap2/Adldap2) for authenticating against AD
* [i18next](http://i18next.com) js library for localization
2 changes: 2 additions & 0 deletions app/Http/Controllers/AdminController.php
Original file line number Diff line number Diff line change
@@ -212,6 +212,8 @@ public function remove_business_unit(): JsonResponse
* "unitid": 1
* }
*
* @todo This is currently not fully compatible with MunkiReport 5.6.5 because it does not return empty strings for
* unset values, or empty arrays for unset collections.
**/
public function get_bu_data(): JsonResponse
{
4 changes: 2 additions & 2 deletions app/Http/Controllers/MachineController.php
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ public function get_duplicate_computernames(): JsonResponse
**/
public function get_model_stats(string $summary = ""): JsonResponse
{
$machine = Machine::selectRaw('count(*) AS count, machine_desc AS label')
->filter()
$machine = Machine::with('reportdata')->selectRaw('count(*) AS count, machine_desc AS label')
->filter() // If the filter scope refers to columns that arent part of selectRaw, the filter just throws an error
->groupBy('machine_desc')
->orderBy('count', 'desc')
->get()
15 changes: 9 additions & 6 deletions docker-compose.yml.example → docker-compose.mariadb.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
version: '3'
services:
munkireport:
build:
context: ./
dockerfile: Dockerfile
image: munkireport/munkireport-php:latest
restart: always
environment:
@@ -11,7 +14,7 @@ services:
- CONNECTION_PORT=3306
- CONNECTION_DATABASE=munkireport
- CONNECTION_USERNAME=munkireport
- CONNECTION_PASSWORD=
- CONNECTION_PASSWORD=munkireport
- AUTH_METHODS=LOCAL
- PUID=1000
- PGID=1000
@@ -21,18 +24,18 @@ services:
depends_on:
- db
ports:
- 80:80
- 8080:8080 # You should avoid privileged ports, here and in kubernetes
volumes:
- ./munkireport-db/:/var/munkireport/app/db
- ./user//:/var/munkireport/local/users
db:
image: mariadb:latest
restart: always
environment:
- MYSQL_ROOT_PASSWORD=
- MYSQL_DATABASE=munkireport
- MYSQL_USER=munkireport
- MYSQL_PASSWORD=
- MARIADB_RANDOM_ROOT_PASSWORD=true
- MARIADB_DATABASE=munkireport
- MARIADB_USER=munkireport
- MARIADB_PASSWORD=munkireport
- PUID=1000
- PGID=1000
- TZ=Europe/Berlin
2 changes: 1 addition & 1 deletion docs/illuminate/laravel-9-upgrade.md
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ https://laravel.com/docs/9.x/upgrade
- Reconcile `public/` just small syntax items.
- Reconcile `routes/` very minor.
- Database factories moved to `fake()` helper instead of faker method

- Migrate webpack to Vite via https://github.com/laravel/vite-plugin/blob/main/UPGRADE.md#migrating-from-laravel-mix-to-vite
Loading