Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NetCommons3/NetCommons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: edumap-jp/NetCommons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 14, 2020

  1. change: 学校ウェブサイト構築申請画面のナビバーば改行されてしまうためwidthを設定できるように修正 

    edumap-jp/Edumap2#49
    @s-nakajima
    s-nakajima committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    5d57415 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. change: test: TravisからPHP5.6を削除 

    NetCommons3/NetCommons3#1588
    @s-nakajima
    s-nakajima committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    fec7b77 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #17 from NetCommons3/master 

    Master merege
    @s-nakajima
    s-nakajima authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    072c828 View commit details
    Browse the repository at this point in the history

  3. Merge composer/master

    @s-nakajima
    s-nakajima committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    a78276f View commit details
    Browse the repository at this point in the history

  4. revert: 誤ってコミットしてしまったため修正

    @s-nakajima
    s-nakajima committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    58f2dcd View commit details
    Browse the repository at this point in the history

  5. Merge pull request #21 from NetCommons3/master 

    Master merge
    @s-nakajima
    s-nakajima authored Jul 31, 2020
    Configuration menu
    Copy the full SHA
    6488fe9 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2020

  1. Merge pull request #26 from NetCommons3/master 

    Mester merge
    @s-nakajima
    s-nakajima authored Oct 29, 2020
    Configuration menu
    Copy the full SHA
    e82a61b View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2020

  1. change: メンテナンスモードの時、metaタグにnoindex等を追加

    @s-nakajima
    s-nakajima committed Nov 13, 2020
    Configuration menu
    Copy the full SHA
    a325a60 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2020

  1. Merge pull request #30 from NetCommons3/master 

    merege NetCommons3
    @s-nakajima
    s-nakajima authored Dec 11, 2020
    Configuration menu
    Copy the full SHA
    fdaceaa View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2021

  1. Merge pull request #32 from NetCommons3/master 

    Merge NetCommons3
    @s-nakajima
    s-nakajima authored Jan 8, 2021
    Configuration menu
    Copy the full SHA
    226c0a5 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. Merge pull request #38 from NetCommons3/master 

    Merge NetCommons3
    @s-nakajima
    s-nakajima authored Feb 18, 2021
    Configuration menu
    Copy the full SHA
    4d91675 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. change: ポータル化に伴い、公式サイトでもIEのアラートを表示するように修正 

    edumap-jp/Edumap2#113
edumap-jp/Edumap2#118
    @s-nakajima
    s-nakajima committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    e1c8676 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #40 from NetCommons3/master 

    fix: here及びrefererのactionがない場合にNoticeにならないように対処
    @s-nakajima
    s-nakajima authored Apr 9, 2021
    Configuration menu
    Copy the full SHA
    13de4ae View commit details
    Browse the repository at this point in the history

Commits on May 28, 2021

  1. Merge origin/master 

    Conflicts:
	Controller/Component/DeprecatedBrowserComponent.php
	Locale/jpn/LC_MESSAGES/net_commons.po
    @s-nakajima
    s-nakajima committed May 28, 2021
    Configuration menu
    Copy the full SHA
    5b3570e View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Merge pull request #46 from NetCommons3/master 

    Merge NetCommons3
    @s-nakajima
    s-nakajima authored Sep 10, 2021
    Configuration menu
    Copy the full SHA
    a2c249a View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2021

  1. Merge pull request #49 from NetCommons3/master 

    Merge NetCommons3
    @s-nakajima
    s-nakajima authored Dec 24, 2021
    Configuration menu
    Copy the full SHA
    41ceb2d View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Merge pull request #51 from NetCommons3/master 

    Merge NetCommons3
    @s-nakajima
    s-nakajima authored Apr 22, 2022
    Configuration menu
    Copy the full SHA
    d953f88 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Merge pull request #57 from NetCommons3/master 

    Merge from NetCommons3/NetCommons
    @s-nakajima
    s-nakajima authored Apr 28, 2023
    Configuration menu
    Copy the full SHA
    d2e089a View commit details
    Browse the repository at this point in the history
Loading