From 6a754768421c747e1119f41159a2b5dfa39da1b0 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 13:33:54 +0900 Subject: [PATCH 1/9] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4cb29e8..7cfa881 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,12 +44,13 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 - name: Fix up git URLs - run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig - name: environment run: | From 3357ca65e226399499333b0c6b7e26e2993f37ab Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 25 Feb 2023 21:27:22 +0900 Subject: [PATCH 2/9] change: Version number to 3.3.6 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index fa7adc7..9c25013 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.5 +3.3.6 From dde50c5ddd631cce6ddd0c509d35bdc38b639ae6 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Wed, 5 Jul 2023 10:38:58 +0900 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E3=83=A1=E3=83=BC=E3=83=AB=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=E3=81=A7=E3=83=AB=E3=83=BC=E3=83=A0=E3=81=AE=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E3=81=8C=E5=8B=95=E4=BD=9C=E3=81=97=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20refs=20https://github.com/NetCommons3/Cale?= =?UTF-8?q?ndars/commit/703f1068ad7ad55adda0010322433387840ff0e7#diff-c94a?= =?UTF-8?q?8afd68cf523b9db149fd27516e62b61c3020f8e429673151511d0d81b074?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/CalendarMailSettings/edit.ctp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/CalendarMailSettings/edit.ctp b/View/CalendarMailSettings/edit.ctp index 3e84770..f3cdde4 100644 --- a/View/CalendarMailSettings/edit.ctp +++ b/View/CalendarMailSettings/edit.ctp @@ -35,7 +35,7 @@ $urlParams = array( $name) : ?> > NetCommonsHtml->link($name, - $urlParams + ['?' => ['room' => $key]] + array_merge_recursive($urlParams, ['?' => ['room' => $key]]) ); ?> From 74d3b0ed9c86bb8c0cf14842e05b57366158dd47 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:00:36 +0900 Subject: [PATCH 4/9] fix: tests.yml --- .github/workflows/tests.yml | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..7e11233 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ name: tests jobs: setup: name: setup - runs-on: ubuntu-18.04 + runs-on: ubuntulatest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 @@ -28,7 +28,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntu-18.04 + runs-on: ubuntulatest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -92,46 +92,53 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/app-build.sh - name: phpcs (PHP CodeSniffer) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh - name: phpmd (PHP Mess Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh - name: phpcpd (PHP Copy/Paste Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh - name: gjslint (JavaScript Style Check) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh - name: phpdoc (PHP Documentor) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh - name: phpunit (PHP UnitTest) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build - - name: push coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ matrix.php }} - run: | - cd ${NC3_BUILD_DIR} - ls -la ${NC3_BUILD_DIR} - vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose rm -f @@ -148,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntulatest needs: tests steps: # テスト成功時はこちらのステップが実行される From 9a72bb804dd2ca4ab6315b97a813c21f455876f3 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Fri, 7 Jul 2023 17:14:14 +0900 Subject: [PATCH 5/9] fix: tests.yml --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7e11233..91735a8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ name: tests jobs: setup: name: setup - runs-on: ubuntulatest + runs-on: ubuntu-latest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 @@ -28,7 +28,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntulatest + runs-on: ubuntu-latest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -155,7 +155,7 @@ jobs: teardown: name: teardown - runs-on: ubuntulatest + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される From c806a54fa0da9e92228e7075b937be9b6a7e6bc9 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 5 Oct 2023 16:40:48 +0900 Subject: [PATCH 6/9] =?UTF-8?q?test:=20github=20action=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 91735a8..eb2068b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,6 +19,7 @@ jobs: steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -128,14 +129,14 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build -# - name: push coveralls -# env: -# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# COVERALLS_FLAG_NAME: ${{ matrix.php }} -# run: | -# cd ${NC3_BUILD_DIR} -# ls -la ${NC3_BUILD_DIR} -# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove if: always() @@ -146,7 +147,7 @@ jobs: # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 - if: failure() + if: env.SLACK_WEBHOOK != '' && failure() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -160,8 +161,8 @@ jobs: steps: # テスト成功時はこちらのステップが実行される - name: Slack Notification on Success - if: success() uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests From 3f584bd33886c8a6a4006efcecc05ac880301e33 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 9 Oct 2023 15:43:48 +0900 Subject: [PATCH 7/9] change: Version number to 3.3.7 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 9c25013..86fb650 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.6 +3.3.7 From 2f814110f8f63688ac140abdb6241785dc845b03 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Tue, 27 May 2025 09:55:47 +0900 Subject: [PATCH 8/9] =?UTF-8?q?fix:=E4=BA=88=E7=B4=84=E3=81=8C=E4=BA=8C?= =?UTF-8?q?=E9=87=8D=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=ABCalendarEvent.id=E3=81=A7?= =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=83=88=E3=81=97=E3=81=A6=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsAppController.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index 5fcd1c3..1db9ca7 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -236,13 +236,20 @@ protected function _setCalendarCommonVars($vars) { $order = array( 'TrackableCreator' . '.handlename', 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', ); } else { //時間順 - $order = array('CalendarEvent' . '.dtstart'); + $order = array( + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } } else { //$order = array('CalendarEvent' . '.start_date'); - $order = array('CalendarEvent' . '.dtstart'); + $order = array( + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } //room_idとspace_idの対応表を載せておく。 From 587b89dd9a59191f7e1ee17f72f2521afc7c2068 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Tue, 27 May 2025 14:23:11 +0900 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/CalendarsAppController.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Controller/CalendarsAppController.php b/Controller/CalendarsAppController.php index 1db9ca7..be7f08f 100644 --- a/Controller/CalendarsAppController.php +++ b/Controller/CalendarsAppController.php @@ -234,22 +234,22 @@ protected function _setCalendarCommonVars($vars) { //$order = array('TrackableCreator' . '.username'); //$order = array('TrackableCreator' . '.handlename'); $order = array( - 'TrackableCreator' . '.handlename', - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'TrackableCreator' . '.handlename', + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } else { //時間順 $order = array( - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } } else { //$order = array('CalendarEvent' . '.start_date'); $order = array( - 'CalendarEvent' . '.dtstart', - 'CalendarEvent' . '.id', - ); + 'CalendarEvent' . '.dtstart', + 'CalendarEvent' . '.id', + ); } //room_idとspace_idの対応表を載せておく。