-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5122 from pymedusa/release/release-0.2.9
Release 0.2.9
- Loading branch information
Showing
689 changed files
with
84,001 additions
and
225,833 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,25 @@ | ||
{ | ||
"name": "Medusa", | ||
"name": "medusa", | ||
"private": true, | ||
"dependencies": { | ||
"jquery": "3.0.0", | ||
"jquery-ui": "1.12.1", | ||
"bootstrap": "3.3.7", | ||
"jqueryui-touch-punch": "*", | ||
"jquery-form": "4.0.1", | ||
"jquery-tokeninput": "^1.7.0", | ||
"jquery-confirm": "2.5.2", | ||
"jquery-backstretch": "^2.1.15", | ||
"bootstrap3-typeahead": "4.0.2", | ||
"lodash": "4.17.4", | ||
"underscore.string": "^3.3.4", | ||
"loglevel": "1.4.1", | ||
"timeago": "1.5.4", | ||
"pnotify": "2.1.0", | ||
"qtip2": "2.2.1", | ||
"tablesorter": "jquery.tablesorter#2.28.1", | ||
"isotope": "3.0.1", | ||
"openSans": "https://google-fonts.azurewebsites.net/googleFonts/openSans?family=Open+Sans:400,300,300italic,400italic,600,600italic,700,700italic,800,800italic", | ||
|
||
"fizzy-ui-utils": "2.0.5", | ||
"get-size": "2.0.2", | ||
"masonry": "4.2.0", | ||
"ev-emitter": "1.1.0", | ||
"imagesloaded": "4.1.3" | ||
}, | ||
"resolutions": { | ||
"bootstrap": "3.3.7", | ||
"jquery": "3.0.0" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,41 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
# Helper function to print the command before running it. | ||
run_verbose () { | ||
echo "\$ $*" | ||
eval $* | ||
echo "\$ $*" | ||
eval $* | ||
} | ||
|
||
# Determine if and how to build the Webpack bundle. | ||
build_cmd="" | ||
build_mode="" | ||
# $TRAVIS_BRANCH is either a PR's target branch, or the current branch if it's a push build. | ||
# Do not build on other branches because it will cause conflicts on pull requests, | ||
# where push builds build for development and PR builds build for production. | ||
if [[ $TRAVIS_BRANCH == "master" ]]; then | ||
build_cmd="yarn build" | ||
build_mode="production" | ||
elif [[ $TRAVIS_BRANCH == "develop" ]]; then | ||
build_cmd="yarn dev" | ||
build_mode="development" | ||
fi | ||
|
||
# Build themes. | ||
cd themes-default/slim/ | ||
[[ -n $build_cmd ]] && run_verbose "$build_cmd" | ||
run_verbose "yarn gulp sync" | ||
cd ../../ | ||
# Check if the themes changed. | ||
status="$(git status --porcelain -- themes/)"; | ||
if [[ -n $status ]]; then | ||
echo "Please build the themes" | ||
echo "-----------------------" | ||
if [[ -z $build_mode ]]; then | ||
echo "Please build the themes" | ||
echo "-----------------------" | ||
else | ||
echo "Please build the themes (mode: $build_mode) " | ||
echo "--------------------------------------------" | ||
fi | ||
echo "$status" | ||
exit 1 | ||
fi | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
--add.exact true | ||
--upgrade.exact true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.