{ "object_kind": "push", "event_name": "push", "before": "95bba5d5d985b6b775a5d8ea87188a2f782500ef", "after": "975448412aef3cb3b187a05f875f1bee01bb6305", "ref": "refs\/heads\/master", "checkout_sha": "975448412aef3cb3b187a05f875f1bee01bb6305", "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": "ac7675dc81db6b7495f08fc4d427f9368eb93d13", "message": "Tasks: #796, #884 + exportData changes + myDH changes\n", "title": "Tasks: #796, #884 + exportData changes + myDH changes", "timestamp": "2021-09-28T16:40:40+02:00", "url": "http:\/\/git.dunahousedev.com\/developers\/matrix\/-\/commit\/ac7675dc81db6b7495f08fc4d427f9368eb93d13", "author": { "name": "Jakab Mih\u00e1ly", "email": "jakabmihaly@dh.hu" }, "added": [ "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/MatrixNewUI\/summernote-cleaner.js" ], "modified": [ "App\/api\/apiClass.php", "App\/api\/template_api\/MX_dictionary.api", "Models\/contracts\/contracts.php", "Models\/listingSideModel.php", "Models\/properties\/properties.php", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/MatrixNewUI\/summernote.js", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiAggregationController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiExportDataController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Libs\/themesLib\/Default\/templateLib\/mc_sellings.tpl", "Sites\/MyDH\/Models\/users\/MyDHauth.php", "Sites\/MyDH\/Modules\/questionnaire\/Controllers\/questionnaireMainController.php" ], "removed": [] }, { "id": "975448412aef3cb3b187a05f875f1bee01bb6305", "message": "merge\n", "title": "merge", "timestamp": "2021-09-28T16:57:27+02:00", "url": "http:\/\/git.dunahousedev.com\/developers\/matrix\/-\/commit\/975448412aef3cb3b187a05f875f1bee01bb6305", "author": { "name": "Jakab Mih\u00e1ly", "email": "jakabmihaly@dh.hu" }, "added": [ "Models\/DHP\/DHP.php", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/MatrixNewUI\/200_BootstrapDialog.js", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/Page\/99_userNotifications.js", "Sites\/MatrixNewUI\/Modules\/user\/Controllers\/userRemoteNotificationsTableController.php" ], "modified": [ "App\/bigCore\/formClass.php", "CRONJOB_SETUP.txt", "Config\/bigcoreConfig.yml", "DB_DATA_CHANGES.txt", "DB_STRUCTURE_CHANGES.txt", "Models\/aggregation\/table\/buyerSearchAgr.php", "Models\/buyingOffers\/buyingOffers.php", "Models\/commissionCalculationModel.php", "Models\/contracts\/contracts.php", "Models\/contractsSearch\/contractsSearch.php", "Models\/loanAgent\/loanAgent.php", "Models\/notifications\/notifications.php", "Models\/office\/office.php", "Models\/positions\/positions.php", "Models\/primaryMarket\/primaryMarketPhases.php", "Models\/properties\/properties.php", "Models\/ttiModel.php", "Sites\/Dashboard\/Config\/siteConfig.yml", "Sites\/Dashboard\/Modules\/cronJobApi\/Controllers\/cronJobApiDashboardController.php", "Sites\/Dashboard\/Modules\/dhDashboard\/Controllers\/dhDashboardMainController.php", "Sites\/Dashboard\/Modules\/dhDashboard\/Libs\/jsLib\/autoLoad\/main.dhDashboard.js", "Sites\/Dashboard\/Modules\/dhDashboard\/Libs\/themesLib\/Default\/templateLib\/main.dhDashboard.tpl", "Sites\/Dashboard\/Modules\/dhDashboard\/Preprocessors\/OfficeIncomeForecast.php", "Sites\/MatrixNewUI\/Libs\/jsLib\/autoLoad\/Buttons\/901_buttons.js", "Sites\/MatrixNewUI\/Libs\/themesLib\/Default\/cssLib\/autoLoad\/MatraixNewUI\/style.css", "Sites\/MatrixNewUI\/Libs\/themesLib\/Default\/templateLib\/Frame\/js_dict.tpl", "Sites\/MatrixNewUI\/Modules\/CMA\/Libs\/jsLib\/autoLoad\/101_search.js", "Sites\/MatrixNewUI\/Modules\/DHP\/Controllers\/DHPPhasesController.php", "Sites\/MatrixNewUI\/Modules\/DHP\/Controllers\/DHPPropertiesController.php", "Sites\/MatrixNewUI\/Modules\/DHP\/Controllers\/DHPSyncController.php", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesFlat.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesGeneral.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesHospitality.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesHouse.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesParking.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesTableFlat.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesTableGeneral.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesTableHospitality.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesTableHouse.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/datatablePropertiesTableParking.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/propertiesTableFlat.form.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/propertiesTableGeneral.form.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/propertiesTableHospitality.form.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/propertiesTableHouse.form.tpl", "Sites\/MatrixNewUI\/Modules\/DHP\/Libs\/themesLib\/Default\/templateLib\/DHPProperties\/propertiesTableParking.form.tpl", "Sites\/MatrixNewUI\/Modules\/buyerContractList\/Controllers\/buyerContractListMainController.php", "Sites\/MatrixNewUI\/Modules\/buyerDataPage\/Controllers\/buyerDataPageMainController.php", "Sites\/MatrixNewUI\/Modules\/buyerDataPage\/Libs\/themesLib\/Default\/templateLib\/buyerDataPage.contract.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Controllers\/buyerSideOfferController.php", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Controllers\/buyerSideSearchController.php", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/cssLib\/autoLoad\/100_moduleStyle.css", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/buyerSide.form.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/buyerSide.offer.table_automaticOffer.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/buyerSide.offer.table_v2.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/buyerSide.showing.details.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/buyerSide.showing.group.details.tpl", "Sites\/MatrixNewUI\/Modules\/buyerSide\/Libs\/themesLib\/Default\/templateLib\/new\/propertySearchMain.card.list2.tpl", "Sites\/MatrixNewUI\/Modules\/buyingOffers\/Controllers\/buyingOffersBlankController.php", "Sites\/MatrixNewUI\/Modules\/buyingOffers\/Controllers\/buyingOffersMainController.php", "Sites\/MatrixNewUI\/Modules\/buyingOffers\/Libs\/pdfLib\/TVAPdf.tpl", "Sites\/MatrixNewUI\/Modules\/contractList\/Controllers\/contractListMainController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiAutomaticOfferController.php", "Sites\/MatrixNewUI\/Modules\/cronJobApi\/Controllers\/cronJobApiExportDataController.php", "Sites\/MatrixNewUI\/Modules\/dashboard\/Controllers\/dashboardMainController.php", "Sites\/MatrixNewUI\/Modules\/listingSide\/Controllers\/listingSideDescriptionController.php", "Sites\/MatrixNewUI\/Modules\/listingSide\/Controllers\/listingSideDocumentsController.php", "Sites\/MatrixNewUI\/Modules\/listingSide\/Libs\/jsLib\/autoLoad\/99_documents.js", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Config\/moduleConfig.yml", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Controllers\/propertyDetailsMainController.php", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Libs\/jsLib\/autoLoad\/100_module.js", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Libs\/pdfLib\/fullSummary.tpl", "Sites\/MatrixNewUI\/Modules\/propertyDetails\/Libs\/themesLib\/Default\/templateLib\/propertyDetails.tpl", "Sites\/MatrixNewUI\/Modules\/propertySearch\/Controllers\/propertySearchMainController.php", "Sites\/MatrixNewUI\/Modules\/propertySearch\/Libs\/themesLib\/Default\/templateLib\/propertySearchMain.card.list_v2.tpl", "Sites\/MatrixNewUI\/Modules\/transactions\/Controllers\/transactionsEditController.php", "Sites\/MatrixNewUI\/Modules\/transactions\/Controllers\/transactionsMainController.php", "Sites\/MatrixNewUI\/Modules\/transactions\/Libs\/themesLib\/Default\/templateLib\/transactions.edit.tpl", "Sites\/MatrixNewUI\/Modules\/user\/Controllers\/userNotiController.php", "Sites\/MatrixNewUI\/Modules\/user\/Libs\/themesLib\/Default\/cssLib\/autoLoad\/100_moduleStyle.css", "Sites\/MatrixNewUI\/Modules\/user\/Libs\/themesLib\/Default\/templateLib\/noti.form.tpl", "Sites\/MatrixNewUI\/Modules\/users\/Libs\/themesLib\/Default\/templateLib\/main.table1.actions.list.tpl", "Sites\/MatrixNewUI\/Modules\/widgets\/Controllers\/widgetsMainController.php" ], "removed": [] } ], "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", " 95bba5d5..97544841 master -> origin\/master", "Checking out files: 32% (7391\/22577) \rChecking out files: 33% (7451\/22577) \rChecking out files: 34% (7677\/22577) \rChecking out files: 35% (7902\/22577) \rChecking out files: 36% (8128\/22577) \rChecking out files: 37% (8354\/22577) \rChecking out files: 38% (8580\/22577) \rChecking out files: 39% (8806\/22577) \rChecking out files: 40% (9031\/22577) \rChecking out files: 41% (9257\/22577) \rChecking out files: 42% (9483\/22577) \rChecking out files: 43% (9709\/22577) \rChecking out files: 44% (9934\/22577) \rChecking out files: 44% (10022\/22577) \rChecking out files: 45% (10160\/22577) \rChecking out files: 45% (10173\/22577) \rChecking out files: 45% (10218\/22577) \rChecking out files: 45% (10270\/22577) \rChecking out files: 45% (10373\/22577) \rChecking out files: 46% (10386\/22577) \rChecking out files: 46% (10493\/22577) \rChecking out files: 46% (10547\/22577) \rChecking out files: 47% (10612\/22577) \rChecking out files: 47% (10730\/22577) \rChecking out files: 47% (10786\/22577) \rChecking out files: 48% (10837\/22577) \rChecking out files: 48% (10855\/22577) \rChecking out files: 48% (11048\/22577) \rChecking out files: 49% (11063\/22577) \rChecking out files: 50% (11289\/22577) \rChecking out files: 50% (11362\/22577) \rChecking out files: 51% (11515\/22577) \rChecking out files: 52% (11741\/22577) \rChecking out files: 52% (11863\/22577) \rChecking out files: 53% (11966\/22577) \rChecking out files: 54% (12192\/22577) \rChecking out files: 55% (12418\/22577) \rChecking out files: 56% (12644\/22577) \rChecking out files: 57% (12869\/22577) \rChecking out files: 58% (13095\/22577) \rChecking out files: 59% (13321\/22577) \rChecking out files: 60% (13547\/22577) \rChecking out files: 61% (13772\/22577) \rChecking out files: 62% (13998\/22577) \rChecking out files: 63% (14224\/22577) \rChecking out files: 64% (14450\/22577) \rChecking out files: 65% (14676\/22577) \rChecking out files: 66% (14901\/22577) \rChecking out files: 67% (15127\/22577) \rChecking out files: 68% (15353\/22577) \rChecking out files: 69% (15579\/22577) \rChecking out files: 70% (15804\/22577) \rChecking out files: 71% (16030\/22577) \rChecking out files: 72% (16256\/22577) \rChecking out files: 73% (16482\/22577) \rChecking out files: 74% (16707\/22577) \rChecking out files: 75% (16933\/22577) \rChecking out files: 76% (17159\/22577) \rChecking out files: 77% (17385\/22577) \rChecking out files: 78% (17611\/22577) \rChecking out files: 79% (17836\/22577) \rChecking out files: 80% (18062\/22577) \rChecking out files: 81% (18288\/22577) \rChecking out files: 82% (18514\/22577) \rChecking out files: 83% (18739\/22577) \rChecking out files: 84% (18965\/22577) \rChecking out files: 85% (19191\/22577) \rChecking out files: 86% (19417\/22577) \rChecking out files: 87% (19642\/22577) \rChecking out files: 88% (19868\/22577) \rChecking out files: 89% (20094\/22577) \rChecking out files: 90% (20320\/22577) \rChecking out files: 91% (20546\/22577) \rChecking out files: 92% (20771\/22577) \rChecking out files: 93% (20997\/22577) \rChecking out files: 94% (21223\/22577) \rChecking out files: 95% (21449\/22577) \rChecking out files: 96% (21674\/22577) \rChecking out files: 97% (21900\/22577) \rChecking out files: 98% (22126\/22577) \rChecking out files: 99% (22352\/22577) \rChecking out files: 100% (22577\/22577) \rChecking out files: 100% (22577\/22577), done.", "HEAD is now at 97544841 merge", "--OK--" ] }