{ "object_kind": "push", "event_name": "push", "before": "14a4ef4bb4f2beb4f22885e465693c6dff5d83f5", "after": "8204ac712fecb0a21ef86d631a051d4888e8612e", "ref": "refs\/heads\/master", "checkout_sha": "8204ac712fecb0a21ef86d631a051d4888e8612e", "message": null, "user_id": 27, "user_name": "Jakab Mih\u00e1ly", "user_username": "jakabmihaly", "user_email": "", "user_avatar": "https:\/\/www.gravatar.com\/avatar\/7f7a09839c4811e39900acae86339f0c?s=80&d=identicon", "project_id": 13, "project": { "id": 13, "name": "matrix", "description": "", "web_url": "http:\/\/git.dunahousedev.com\/developers\/matrix", "avatar_url": null, "git_ssh_url": "git@git.dunahousedev.com:developers\/matrix.git", "git_http_url": "http:\/\/git.dunahousedev.com\/developers\/matrix.git", "namespace": "developers", "visibility_level": 0, "path_with_namespace": "developers\/matrix", "default_branch": "master", "ci_config_path": null, "homepage": "http:\/\/git.dunahousedev.com\/developers\/matrix", "url": "git@git.dunahousedev.com:developers\/matrix.git", "ssh_url": "git@git.dunahousedev.com:developers\/matrix.git", "http_url": "http:\/\/git.dunahousedev.com\/developers\/matrix.git" }, "commits": [ { "id": "7758efb314913f54dd892110cf1e57dffee31331", "message": "Tasks: #317, #554 +myDH fixes\n", "title": "Tasks: #317, #554 +myDH fixes", "timestamp": "2021-10-13T20:41:52+02:00", "url": "http:\/\/git.dunahousedev.com\/developers\/matrix\/-\/commit\/7758efb314913f54dd892110cf1e57dffee31331", "author": { "name": "Jakab Mih\u00e1ly", "email": "jakabmihaly@dh.hu" }, "added": [ "Files\/Floorplan\/tmp\/3040000002747\/61671727366d97388d11f8ec.jpg", "Sites\/floorplanner\/Libs\/themesLib\/Default\/gfxLib\/ikon_felirat.png", "Sites\/floorplanner\/Modules\/main\/Libs\/jsLib\/autoLoad\/002.jquery.ui.js", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objects\/others\/iranytu.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objects\/others\/nyil1.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objects\/others\/nyil2.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objects\/others\/nyil3.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/big\/iranytu.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/big\/nyil1.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/big\/nyil2.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/big\/nyil3.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/normal\/iranytu.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/normal\/nyil1.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/normal\/nyil2.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/normal\/nyil3.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/small\/iranytu.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/small\/nyil1.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/small\/nyil2.png", "Sites\/floorplanner\/Modules\/main\/Libs\/themesLib\/Default\/gfxLib\/objectsResized\/others\/small\/nyil3.png" ], "modified": [ "Models\/commissionCalculationModel.php", "Sites\/MatrixNewUI\/Modules\/transactions\/Controllers\/transactionsMainController.php", "Sites\/MyDH\/Models\/users\/MyDHauth.php", "Sites\/MyDH\/Modules\/cronJobApi\/Controllers\/cronJobApiMainController.php", "Sites\/floorplanner\/Libs\/themesLib\/Default\/templateLib\/Frame\/site_header.tpl", "Sites\/floorplanner\/Modules\/main\/Libs\/jsLib\/autoLoad\/floorplan\/floorplan_151126.js" ], "removed": [] }, { "id": "8204ac712fecb0a21ef86d631a051d4888e8612e", "message": "Merge branch 'master' of git.dunahousedev.com:developers\/matrix\n", "title": "Merge branch 'master' of git.dunahousedev.com:developers\/matrix", "timestamp": "2021-10-13T20:42:56+02:00", "url": "http:\/\/git.dunahousedev.com\/developers\/matrix\/-\/commit\/8204ac712fecb0a21ef86d631a051d4888e8612e", "author": { "name": "Jakab Mih\u00e1ly", "email": "jakabmihaly@dh.hu" }, "added": [ "Files\/images\/primeContracts\/pdf-header.png" ], "modified": [ "DB_DATA_CHANGES.txt", "DB_STRUCTURE_CHANGES.txt", "Models\/aggregation\/table\/buyerSearchAgr.php", "Models\/buyingOffers\/buyingOffers.php", "Models\/dashboard\/dashboard.php", "Models\/notifications\/notifications.php", "Models\/primaryMarket\/primaryMarketPhases.php", "Sites\/Dashboard\/Modules\/dhDashboard\/Preprocessors\/OfficeIncomeForecast.php", "Sites\/MatrixNewUI\/Libs\/assets\/vendors\/base\/vendors.bundle.js", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/deactivateModule\/deactivateModule.js", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/widgets\/101_cockpit.js", "Sites\/MatrixNewUI\/Libs\/themesLib\/Default\/cssLib\/autoLoad\/Widgets\/cockpit.css", "Sites\/MatrixNewUI\/Libs\/themesLib\/Default\/templateLib\/Frame\/js_dict.tpl", "Sites\/MatrixNewUI\/Libs\/themesLib\/Default\/templateLib\/siteHeader\/userMenu.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Controllers\/DHPPropertiesController.php", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties.description.form.tpl", "Sites\/MatrixNewUI\/Modules\/buyerDataPage\/Libs\/jsLib\/autoLoad\/NewMatrixUI_buyerDataPage.js", "Sites\/MatrixNewUI\/Modules\/buyingOffers\/Controllers\/buyingOffersMainController.php", "Sites\/MatrixNewUI\/Modules\/cockpit\/Controllers\/cockpitMainController.php", "Sites\/MatrixNewUI\/Modules\/cockpit\/Libs\/themesLib\/Default\/templateLib\/drillDialogs\/buyingOffers.tpl", "Sites\/MatrixNewUI\/Modules\/cockpit\/Libs\/themesLib\/Default\/templateLib\/frame.tpl", "Sites\/MatrixNewUI\/Modules\/cockpit\/Libs\/themesLib\/Default\/templateLib\/result.tpl", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiDataFixController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiExportDataController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiMainController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiMarketingExportController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiMorningCoffeeController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiPairingController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiTagController.php", "Sites\/MatrixNewUI\/Modules\/cronMonitor\/Controllers\/cronMonitorMainController.php", "Sites\/MatrixNewUI\/Modules\/listingSide\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/MatrixNewUI\/Modules\/login\/Controllers\/loginMainController.php", "Sites\/MatrixNewUI\/Modules\/notificationTemplates\/Controllers\/notificationTemplatesMainController.php", "Sites\/MatrixNewUI\/Modules\/primeContracts\/Controllers\/primeContractsMainController.php", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/MatrixNewUI\/Modules\/reservations_v2\/Controllers\/reservations_v2MainController.php", "Sites\/MatrixNewUI\/Modules\/reservations_v2\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/MatrixNewUI\/Modules\/reservations_v2\/Libs\/themesLib\/Default\/templateLib\/buttons\/clientBox-buttons.tpl", "Sites\/MatrixNewUI\/Modules\/transactions\/Libs\/jsLib\/autoLoad\/transactions_discounts.js", "Sites\/MatrixNewUI\/Modules\/user\/Libs\/themesLib\/Default\/templateLib\/userNotifications.form.tpl" ], "removed": [ "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiCheckController.php" ] } ], "total_commits_count": 2, "push_options": [], "repository": { "name": "matrix", "url": "git@git.dunahousedev.com:developers\/matrix.git", "description": "", "homepage": "http:\/\/git.dunahousedev.com\/developers\/matrix", "git_http_url": "http:\/\/git.dunahousedev.com\/developers\/matrix.git", "git_ssh_url": "git@git.dunahousedev.com:developers\/matrix.git", "visibility_level": 0 }, "output": [ "\/etc\/apache2\/sites-available\/jakabmihaly.matrix.dunahousedev.com.conf exists.", "\/etc\/apache2\/sites-available\/matrix.dunahousedev.com.conf exists.", "Fetching origin", "From git.dunahousedev.com:developers\/matrix", " 14a4ef4b..8204ac71 master -> origin\/master", "Checking out files: 31% (7115\/22505) \rChecking out files: 32% (7202\/22505) \rChecking out files: 33% (7427\/22505) \rChecking out files: 34% (7652\/22505) \rChecking out files: 35% (7877\/22505) \rChecking out files: 36% (8102\/22505) \rChecking out files: 37% (8327\/22505) \rChecking out files: 38% (8552\/22505) \rChecking out files: 39% (8777\/22505) \rChecking out files: 40% (9002\/22505) \rChecking out files: 41% (9228\/22505) \rChecking out files: 42% (9453\/22505) \rChecking out files: 43% (9678\/22505) \rChecking out files: 44% (9903\/22505) \rChecking out files: 44% (10056\/22505) \rChecking out files: 45% (10128\/22505) \rChecking out files: 45% (10211\/22505) \rChecking out files: 45% (10265\/22505) \rChecking out files: 45% (10310\/22505) \rChecking out files: 46% (10353\/22505) \rChecking out files: 46% (10399\/22505) \rChecking out files: 46% (10535\/22505) \rChecking out files: 47% (10578\/22505) \rChecking out files: 47% (10580\/22505) \rChecking out files: 47% (10651\/22505) \rChecking out files: 48% (10803\/22505) \rChecking out files: 48% (10814\/22505) \rChecking out files: 48% (10864\/22505) \rChecking out files: 49% (11028\/22505) \rChecking out files: 49% (11044\/22505) \rChecking out files: 49% (11178\/22505) \rChecking out files: 50% (11253\/22505) \rChecking out files: 50% (11433\/22505) \rChecking out files: 51% (11478\/22505) \rChecking out files: 52% (11703\/22505) \rChecking out files: 53% (11928\/22505) \rChecking out files: 54% (12153\/22505) \rChecking out files: 55% (12378\/22505) \rChecking out files: 56% (12603\/22505) \rChecking out files: 57% (12828\/22505) \rChecking out files: 58% (13053\/22505) \rChecking out files: 59% (13278\/22505) \rChecking out files: 60% (13503\/22505) \rChecking out files: 61% (13729\/22505) \rChecking out files: 61% (13903\/22505) \rChecking out files: 62% (13954\/22505) \rChecking out files: 63% (14179\/22505) \rChecking out files: 64% (14404\/22505) \rChecking out files: 65% (14629\/22505) \rChecking out files: 66% (14854\/22505) \rChecking out files: 67% (15079\/22505) \rChecking out files: 68% (15304\/22505) \rChecking out files: 69% (15529\/22505) \rChecking out files: 70% (15754\/22505) \rChecking out files: 71% (15979\/22505) \rChecking out files: 72% (16204\/22505) \rChecking out files: 73% (16429\/22505) \rChecking out files: 74% (16654\/22505) \rChecking out files: 75% (16879\/22505) \rChecking out files: 76% (17104\/22505) \rChecking out files: 77% (17329\/22505) \rChecking out files: 78% (17554\/22505) \rChecking out files: 79% (17779\/22505) \rChecking out files: 80% (18004\/22505) \rChecking out files: 81% (18230\/22505) \rChecking out files: 82% (18455\/22505) \rChecking out files: 83% (18680\/22505) \rChecking out files: 84% (18905\/22505) \rChecking out files: 85% (19130\/22505) \rChecking out files: 86% (19355\/22505) \rChecking out files: 87% (19580\/22505) \rChecking out files: 88% (19805\/22505) \rChecking out files: 89% (20030\/22505) \rChecking out files: 90% (20255\/22505) \rChecking out files: 91% (20480\/22505) \rChecking out files: 92% (20705\/22505) \rChecking out files: 93% (20930\/22505) \rChecking out files: 94% (21155\/22505) \rChecking out files: 95% (21380\/22505) \rChecking out files: 96% (21605\/22505) \rChecking out files: 97% (21830\/22505) \rChecking out files: 98% (22055\/22505) \rChecking out files: 99% (22280\/22505) \rChecking out files: 100% (22505\/22505) \rChecking out files: 100% (22505\/22505), done.", "HEAD is now at 8204ac71 Merge branch 'master' of git.dunahousedev.com:developers\/matrix", "--OK--" ] }