{ "object_kind": "push", "event_name": "push", "before": "5f3a7dbcff1fc80eabdc24ef34e9bdad607f6622", "after": "b8373b244b0a2f30803df7232a486b6858e1dadc", "ref": "refs\/heads\/main", "ref_protected": true, "checkout_sha": "b8373b244b0a2f30803df7232a486b6858e1dadc", "message": null, "user_id": 49, "user_name": "Fekete \u00c1ron", "user_username": "feketearon", "user_email": null, "user_avatar": "https:\/\/www.gravatar.com\/avatar\/59f21d6077df970fce0a9faf1091f60586b171034ff0b5834f2fdeb434bf4727?s=80&d=identicon", "project_id": 151, "project": { "id": 151, "name": "crediapp", "description": "", "web_url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp", "avatar_url": null, "git_ssh_url": "git@git.dunahousedev.hu:crediapp\/crediapp.git", "git_http_url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp.git", "namespace": "CrediApp", "visibility_level": 0, "path_with_namespace": "crediapp\/crediapp", "default_branch": "main", "ci_config_path": "", "homepage": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp", "url": "git@git.dunahousedev.hu:crediapp\/crediapp.git", "ssh_url": "git@git.dunahousedev.hu:crediapp\/crediapp.git", "http_url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp.git" }, "commits": [ { "id": "97ccff2d76f888c5fc77d984302e77b59fde1de0", "message": "sum points based on point type\n", "title": "sum points based on point type", "timestamp": "2026-03-25T15:54:41+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/97ccff2d76f888c5fc77d984302e77b59fde1de0", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php" ], "removed": [] }, { "id": "b1a7dce2628fd896f120ee8c8fcbd8277cd4725b", "message": "Merge remote-tracking branch 'origin\/86c7xr3nh-iroda_pont' into 86c7xr3nh-termek_kategoria_OM_pont-leaderboard\n\n# Conflicts:\n#\tApp\/bigCore\/productCategoriesClass.php\n", "title": "Merge remote-tracking branch 'origin\/86c7xr3nh-iroda_pont' into...", "timestamp": "2026-03-25T15:55:49+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/b1a7dce2628fd896f120ee8c8fcbd8277cd4725b", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [ "Sites\/Crediapp\/Modules\/cases\/Controllers\/casesOmPointsController.php", "Sites\/Crediapp\/Modules\/cases\/Controllers\/casesOmPointsToShareController.php", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/block.omPointsToShareTable.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/datatable.omPoints.list.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/datatable.omPointsToShare.list.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/module.addOmPointForm.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/module.addOmPointToShareForm.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/block.omPointsTable.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/components\/officeNavbar.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/module.addOmPointForm.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/module.viewOfficeOmPoints.tpl", "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/block.omPointsToShareTable.tpl", "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/module.omPointSettingsForm.tpl", "db\/migrations\/20260302134907_om_points_extension.php", "db\/migrations\/20260302220356_user_office_om_point_settings.php", "db\/migrations\/20260309133506_om_points_date_of_credit.php" ], "modified": [ "App\/api\/apiClass.php", "App\/api\/template_api\/matrixOmTransactions.api", "App\/bigCore\/clients\/clientsClass.php", "App\/bigCore\/clients\/leadsClass.php", "App\/bigCore\/metronicDatatableClass.php", "App\/bigCore\/omPoints\/omClass.php", "App\/bigCore\/omPoints\/omPointsFormClass.php", "App\/bigCore\/positionsClass.php", "App\/bigCore\/productCategoriesClass.php", "App\/bigCore\/users\/usersClass.php", "Libs\/jsLib\/autoLoad\/classes\/functions.js", "Libs\/jsLib\/autoLoad\/classes\/linksClass.js", "Libs\/jsLib\/autoLoad\/classes\/submodulesClass.js", "Sites\/ClientPortal\/Libs\/jsLib\/autoLoad\/clientPortal.js", "Sites\/Crediapp\/Libs\/jsLib\/autoLoad\/Crediapp.site.js", "Sites\/Crediapp\/Libs\/jsLib\/autoLoad\/metronicDatatable.js", "Sites\/Crediapp\/Libs\/jsLib\/autoLoad\/metronicForms.js", "Sites\/Crediapp\/Libs\/themesLib\/Default\/templateLib\/Components\/form.submodule.tpl", "Sites\/Crediapp\/Libs\/themesLib\/Default\/templateLib\/Frame\/js_dict.tpl", "Sites\/Crediapp\/Modules\/aronTest\/Controllers\/aronTestMainController.php", "Sites\/Crediapp\/Modules\/cases\/Controllers\/casesMainController.php", "Sites\/Crediapp\/Modules\/cases\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/components\/navbar.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/module.form.tpl", "Sites\/Crediapp\/Modules\/cases\/Libs\/themesLib\/Default\/templateLib\/module.view.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Controllers\/matrixDataMainController.php", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/module.viewOffice.tpl", "Sites\/Crediapp\/Modules\/matrixData\/Libs\/themesLib\/Default\/templateLib\/module.viewPartner.tpl", "Sites\/Crediapp\/Modules\/productsCategories\/Controllers\/productsCategoriesMainController.php", "Sites\/Crediapp\/Modules\/productsCategories\/Libs\/jsLib\/autoLoad\/300_module.js", "Sites\/Crediapp\/Modules\/productsCategories\/Libs\/themesLib\/Default\/templateLib\/module.form.tpl", "Sites\/Crediapp\/Modules\/temitest\/Controllers\/temitestMainController.php", "Sites\/Crediapp\/Modules\/users\/Controllers\/usersMainController.php", "Sites\/Crediapp\/Modules\/users\/Libs\/jsLib\/autoLoad\/module.js", "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/block.omPointsTable.tpl", "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/module.omPoints.tpl", "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/module.omPointsPersonalForm.tpl", "db\/migrations\/20260225094437_add_om_transactions_table.php" ], "removed": [ "Sites\/Crediapp\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/block.omPointsPersonalTable.tpl" ] }, { "id": "fe6baa57bede476621f50de4087471ac560ce344", "message": "fix query condition\n", "title": "fix query condition", "timestamp": "2026-03-25T15:58:21+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/fe6baa57bede476621f50de4087471ac560ce344", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php" ], "removed": [] }, { "id": "9f9e553fa4c55a041a2c053139aaff553bd4fb91", "message": "set credited if office point is custom\n", "title": "set credited if office point is custom", "timestamp": "2026-03-25T16:19:12+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/9f9e553fa4c55a041a2c053139aaff553bd4fb91", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "App\/bigCore\/omPoints\/omClass.php" ], "removed": [] }, { "id": "c40fa844e0fb9fac927fc0fd3b8a4c7811752b89", "message": "Merge remote-tracking branch 'origin\/86c7xr3nh-termek_kategoria_OM_pont-leaderboard' into 86c7xr3nh-iroda_pont\n\n# Conflicts:\n#\tApp\/bigCore\/productCategoriesClass.php\n", "title": "Merge remote-tracking branch...", "timestamp": "2026-03-26T08:29:08+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/c40fa844e0fb9fac927fc0fd3b8a4c7811752b89", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [ "Sites\/Crediapp\/Modules\/leaderBoard\/Config\/moduleConfig.yml", "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/jsLib\/autoLoad\/module.js", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/cssLib\/autoLoad\/module.css", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/_listOfficesRows.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/_listRows.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/leaderBoard.list.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/leaderBoard.listOffices.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/officePointsSummary.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Libs\/themesLib\/Default\/templateLib\/pointsSummary.tpl", "Sites\/Crediapp\/Modules\/leaderBoard\/Loader\/moduleLoader.php", "db\/migrations\/20260302103836_update_modules_table.php" ], "modified": [ "App\/bigCore\/productCategoriesClass.php", "Libs\/cssLib\/autoLoad\/101_credipass.css", "Libs\/cssLib\/autoLoad\/101_credipass.css.map", "Libs\/cssLib\/autoLoad\/101_credipass.less", "Sites\/Crediapp\/Libs\/jsLib\/autoLoad\/menuBalance.js", "Sites\/Crediapp\/Libs\/themesLib\/Default\/templateLib\/Frame\/js_dict.tpl", "Sites\/Crediapp\/Libs\/themesLib\/Default\/templateLib\/Frame\/site_horizontal_menu.tpl" ], "removed": [] }, { "id": "0aa7a49ae58ff028a7ebc4a971061cd700d2f9b6", "message": "Merge remote-tracking branch 'origin\/86c7xr3nh-termek_kategoria_OM_pont-leaderboard' into 86c7xr3nh-iroda_pont\n\n# Conflicts:\n#\tApp\/bigCore\/productCategoriesClass.php\n", "title": "Merge remote-tracking branch...", "timestamp": "2026-03-26T08:46:45+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/0aa7a49ae58ff028a7ebc4a971061cd700d2f9b6", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "App\/bigCore\/omPoints\/omClass.php", "App\/bigCore\/productCategoriesClass.php", "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php" ], "removed": [] }, { "id": "56f867db1c56a23f894c2b7221a8ede1467cdbe4", "message": "adjust code to om points to share\n", "title": "adjust code to om points to share", "timestamp": "2026-03-26T11:30:08+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/56f867db1c56a23f894c2b7221a8ede1467cdbe4", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php" ], "removed": [] }, { "id": "297aad60c6241cf928ef1caaab0dd43122c4ee9b", "message": "sum total points\n", "title": "sum total points", "timestamp": "2026-03-26T11:47:58+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/297aad60c6241cf928ef1caaab0dd43122c4ee9b", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "Sites\/Crediapp\/Modules\/matrixData\/Controllers\/matrixDataMainController.php" ], "removed": [] }, { "id": "3dca20d0b6805451c854448662e2f35fbef0880a", "message": "if manual point is penalty, the shared point should be negative\n", "title": "if manual point is penalty, the shared point should be negative", "timestamp": "2026-03-26T11:57:04+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/3dca20d0b6805451c854448662e2f35fbef0880a", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "App\/bigCore\/omPoints\/omClass.php" ], "removed": [] }, { "id": "6def7162f1cfb32c3dad72036b95989d1f4925aa", "message": "if manual point is penalty, the shared point should be negative\n", "title": "if manual point is penalty, the shared point should be negative", "timestamp": "2026-03-26T13:10:02+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/6def7162f1cfb32c3dad72036b95989d1f4925aa", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "App\/bigCore\/omPoints\/omClass.php" ], "removed": [] }, { "id": "970e3ebfd23f3cec98dea4b9af09953b0a07459a", "message": "init inputmask on input field\n", "title": "init inputmask on input field", "timestamp": "2026-03-26T13:10:21+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/970e3ebfd23f3cec98dea4b9af09953b0a07459a", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "Sites\/Crediapp\/Modules\/cases\/Libs\/jsLib\/autoLoad\/100_module.js" ], "removed": [] }, { "id": "b8373b244b0a2f30803df7232a486b6858e1dadc", "message": "Merge remote-tracking branch 'origin\/86c7xr3nh-iroda_pont'\n\n# Conflicts:\n#\tApp\/bigCore\/productCategoriesClass.php\n", "title": "Merge remote-tracking branch 'origin\/86c7xr3nh-iroda_pont'", "timestamp": "2026-03-26T13:20:26+01:00", "url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp\/-\/commit\/b8373b244b0a2f30803df7232a486b6858e1dadc", "author": { "name": "Fekete \u00c1ron", "email": "fekete.aron@dh.hu" }, "added": [], "modified": [ "App\/bigCore\/omPoints\/omClass.php", "App\/bigCore\/productCategoriesClass.php", "Sites\/Crediapp\/Modules\/cases\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/Crediapp\/Modules\/leaderBoard\/Controllers\/leaderBoardMainController.php", "Sites\/Crediapp\/Modules\/matrixData\/Controllers\/matrixDataMainController.php" ], "removed": [] } ], "total_commits_count": 12, "push_options": [], "repository": { "name": "crediapp", "url": "git@git.dunahousedev.hu:crediapp\/crediapp.git", "description": "", "homepage": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp", "git_http_url": "http:\/\/git.dunahousedev.hu\/crediapp\/crediapp.git", "git_ssh_url": "git@git.dunahousedev.hu:crediapp\/crediapp.git", "visibility_level": 0 }, "output": [ "\/etc\/apache2\/sites-available\/feketearon.crediapp.dunahousedev.hu.conf exists.", "\/etc\/apache2\/sites-available\/crediapp.dunahousedev.hu.conf exists.", "Saving debug log to \/var\/log\/letsencrypt\/letsencrypt.log", "Saving debug log to \/var\/log\/letsencrypt\/letsencrypt.log", "Fetching origin", "From git.dunahousedev.hu:crediapp\/crediapp", " 5f3a7dbcf..b8373b244 main -> origin\/main", "Updating files: 97% (5157\/5280)\rUpdating files: 98% (5175\/5280)\rUpdating files: 99% (5228\/5280)\rUpdating files: 100% (5280\/5280)\rUpdating files: 100% (5280\/5280), done.", "HEAD is now at b8373b244 Merge remote-tracking branch 'origin\/86c7xr3nh-iroda_pont'", "--OK--" ] }