Skip to content

Commit

Permalink
Merge pull request #1350 from matsuo/release-5.11
Browse files Browse the repository at this point in the history
Update buildup.sh and change_log.txt for releasing version 5.11
  • Loading branch information
msyk committed Nov 17, 2019
2 parents 17b10f4 + f0f7a69 commit 6cdc823
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist-docs/buildup.sh
Expand Up @@ -8,7 +8,7 @@
# Please see the full license for details:
# https://github.com/INTER-Mediator/INTER-Mediator/blob/master/dist-docs/License.txt

version="5.11-dev"
version="5.11"

# The file of minify <http://www.minifier.org> can be downloaded from below.
# git clone https://github.com/matthiasmullie/minify
Expand Down
2 changes: 1 addition & 1 deletion dist-docs/change_log.txt
Expand Up @@ -10,7 +10,7 @@ Please check: https://github.com/INTER-Mediator/INTER-Mediator
Also the Migration Guide (Japanese) might be informative:
http://inter-mediator.info/ja/for-developers/migration.html

Ver.5.11-dev (in development)
Ver.5.11 (November 17, 2019)
- Support FileMaker Data API of FileMaker Server 18 and FileMaker Cloud for AWS 1.18.
- Update FMDataAPI.php (Ver.20) and DB_FileMaker_DataAPI.php for FileMaker Data API.
- Improve handling Microsoft Office documents in MediaAccess class (Thanks to Mr. Takayoshi Wada).
Expand Down
4 changes: 2 additions & 2 deletions dist-docs/docker/spec/samples/samples_spec.rb
Expand Up @@ -45,8 +45,8 @@
@driver.manage.timeouts.page_load = 10
end

it "The title of the first page should be 'INTER-Mediator 5.11-dev - VM for Trial'." do
expect(@driver.title).to eq("INTER-Mediator 5.11-dev - VM for Trial")
it "The title of the first page should be 'INTER-Mediator 5.11 - VM for Trial'." do
expect(@driver.title).to eq("INTER-Mediator 5.11 - VM for Trial")
end

it "Page File Editor should be working" do
Expand Down
4 changes: 2 additions & 2 deletions dist-docs/vm-for-trial/deploy.sh
Expand Up @@ -228,8 +228,8 @@ cd "${WEBROOT}"
git clone https://github.com/INTER-Mediator/INTER-Mediator.git && cd INTER-Mediator && git remote add upstream https://github.com/INTER-Mediator/INTER-Mediator.git && git checkout 5.x
result=`git diff 5.x..release 2> /dev/null`
if [ "$result" = '' ]; then
#git checkout stable
git checkout 5.x
git checkout stable
#git checkout 5.x
fi

rm -f "${WEBROOT}/index.html"
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
@@ -1 +1 @@
{"version":"5.11-dev","releasedate":"2019-11-16"}
{"version":"5.11","releasedate":"2019-11-17"}

0 comments on commit 6cdc823

Please sign in to comment.