Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'develop' into develop
  • Loading branch information
Gamesh committed Nov 15, 2019
2 parents 6b0f5e9 + 3922788 commit 3474054
Show file tree
Hide file tree
Showing 1,115 changed files with 70,610 additions and 5,456 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Expand Up @@ -93,6 +93,18 @@ tests-legacy/resources/modules/referralprogram/
!/admin-dev/export/.htaccess
!/admin-dev/export/index.php

# Downloaded RTL files
/admin-dev/themes/default/css/bundle/default_rtl.css
/admin-dev/themes/default/css/bundle/shared_rtl.css
/admin-dev/themes/default/css/font_rtl.css
/admin-dev/themes/default/css/overrides_rtl.css
/admin-dev/themes/default/css/vendor/font-awesome/font-awesome_rtl.css
/admin-dev/themes/default/css/vendor/nv.d3_rtl.css
/admin-dev/themes/default/css/vendor/titatoggle-min_rtl.css
/admin-dev/themes/default/public/theme_rtl.css
/admin-dev/themes/new-theme/css/module/drop_rtl.css
/admin-dev/themes/new-theme/css/right-sidebar_rtl.css

themes/*/cache/*

# Config
Expand Down
21 changes: 10 additions & 11 deletions .travis.yml
Expand Up @@ -28,18 +28,25 @@ php:
env:
global:
- SYMFONY_DEPRECATIONS_HELPER=disabled
- DISABLE_DEBUG_TOOLBAR=1
matrix:
- PRESTASHOP_TEST_TYPE=unit
- PRESTASHOP_TEST_TYPE=integration
- PRESTASHOP_TEST_TYPE=sanity

stages:
- name: deploy
if: type = cron
- name: test
if: type IN (push, pull_request)

matrix:
include:
- php: 7.2
env: EXTRA_DEPS=phpHigh PRESTASHOP_TEST_TYPE=unit
- stage: deploy
php: 7.2
before_install: skip
before_script: skip
install: skip
script:
- mkdir -p /tmp/ps-release
- php tools/build/CreateRelease.php --destination-dir=/tmp/ps-release
Expand All @@ -57,9 +64,6 @@ matrix:
local-dir: "/tmp/ps-release"
on:
all_branches: true
allow_failures:
- php: 7.2
env: EXTRA_DEPS=phpHigh PRESTASHOP_TEST_TYPE=unit

before_install:
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_10.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :10 -ac -screen 0 1600x1200x16
Expand All @@ -73,12 +77,7 @@ before_install:
- cp tests-legacy/parameters.yml.travis app/config/parameters.yml

before_script:
- if [ "$EXTRA_DEPS" = "phpHigh" ]; then
composer update --ignore-platform-reqs --no-suggest --ansi --no-interaction --no-progress --quiet;
else
composer install --no-suggest --ansi --prefer-dist --no-interaction --no-progress --quiet;
fi

- composer install --no-suggest --ansi --prefer-dist --no-interaction --no-progress --quiet;
- bash travis-scripts/install-prestashop;

script:
Expand Down
20 changes: 10 additions & 10 deletions INSTALL.txt
Expand Up @@ -48,7 +48,7 @@

To install PrestaShop 1.7, you need a web server running PHP 7.1.3+ and any flavor of MySQL 5.5+ (MySQL, MariaDB, Percona Server, etc.).

You can find more information on our System requirements (https://devdocs.prestashop.com/1.7/basics/installation/system-requirements/) page and on the System Administrator Guide (http://doc.prestashop.com/display/PS16/System+Administrator+Guide).
You can find more information on our System requirements (https://devdocs.prestashop.com/1.7/basics/installation/system-requirements/) page and on the System Administrator Guide (https://doc.prestashop.com/display/PS16/System+Administrator+Guide).

=== Installing PrestaShop

Expand All @@ -59,15 +59,15 @@ Here is the content of this archive:
* This INSTALL.txt file
* The prestashop.zip archive, which contains all the necessary files.
* The index.php file, which will automatically unzip the prestashop.zip archive for you.
* The Install_PrestaShop.html file, which redirects you to http://doc.prestashop.com/display/PS17/Installing+PrestaShop
* The Install_PrestaShop.html file, which redirects you to https://doc.prestashop.com/display/PS17/Installing+PrestaShop

From there on, follow these instructions:

1. Upload at least index.php and prestashop.zip on your web server.
2. From your web browser, go to the folder where index.html and prestashop.zip have been uploaded. The Zip archive should unzip automatically.
3. You are redirected to the PrestaShop installer. Simply follow the instructions.
2. From your web browser, go to the folder where index.html and prestashop.zip have been uploaded and browse index.html. The Zip archive should unzip automatically.
3. You are redirected to the PrestaShop installer. Follow the instructions.

After PrestaShop has successfuly been installed, delete the /install/ folder from your server!
After PrestaShop has successfuly been installed, delete the /install/ folder from your server.

Enjoy your store :)

Expand All @@ -76,11 +76,11 @@ Enjoy your store :)

Essential links about PrestaShop:

* User Guide: http://doc.prestashop.com/display/PS17/User+Guide
* Tech docs (modules & themes): https://developers.prestashop.com/
* Official blog: https://www.prestashop.com/blog/en/
* Devteam blog: http://build.prestashop.com/
* Get community support: http://www.prestashop.com/forums/
* User Guide: https://doc.prestashop.com/display/PS17/User+Guide
* Tech docs (modules & themes): https://devdocs.prestashop.com/
* Official blog: https://www.prestashop.com/en/blog
* Developer blog: https://build.prestashop.com/
* Get community support: https://www.prestashop.com/forums/
* Get paid support: https://www.prestashop.com/en/support
* Find modules and themes: https://addons.prestashop.com/
* Contribute with code: https://github.com/PrestaShop/PrestaShop
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,7 +1,7 @@
About PrestaShop
--------

[![Build Status](https://travis-ci.org/PrestaShop/PrestaShop.svg?branch=develop)](https://travis-ci.org/PrestaShop/PrestaShop)
[![Build Status](https://travis-ci.com/PrestaShop/PrestaShop.svg?branch=develop)](https://travis-ci.com/PrestaShop/PrestaShop)
[![Gitter chat](https://badges.gitter.im/PrestaShop/PrestaShop.png)](https://gitter.im/PrestaShop/General)


Expand Down
2 changes: 1 addition & 1 deletion admin-dev/index.php
Expand Up @@ -71,7 +71,7 @@
}
require_once __DIR__.'/../app/AppKernel.php';

$kernel = new AppKernel(_PS_MODE_DEV_?'dev':'prod', _PS_MODE_DEV_);
$kernel = new AppKernel(_PS_ENV_, _PS_MODE_DEV_);
//$kernel = new AppCache($kernel);
// When using the HttpCache, you need to call the method in your front controller instead of relying on the configuration parameter
//Request::enableHttpMethodParameterOverride();
Expand Down
9 changes: 0 additions & 9 deletions admin-dev/themes/default/js/bundle/product/form.js
Expand Up @@ -1156,15 +1156,6 @@ var attachmentProduct = (function() {
var buttonSave = $('#form_step6_attachment_product_add');
var buttonCancel = $('#form_step6_attachment_product_cancel');

/** check all attachments files */
$('#product-attachment-files-check').change(function() {
if ($(this).is(":checked")) {
$('#product-attachment-file input[type="checkbox"]').prop('checked', true);
} else {
$('#product-attachment-file input[type="checkbox"]').prop('checked', false);
}
});

buttonCancel.click(function (){
resetAttachmentForm();
});
Expand Down
1 change: 1 addition & 0 deletions admin-dev/themes/default/js/theme.js
Expand Up @@ -25,6 +25,7 @@
import '../sass/font.scss';
import '../sass/admin-theme.sass';
import '../node_modules/perfect-scrollbar/css/perfect-scrollbar.css';
import '@openfonts/ubuntu-condensed_latin';

import PerfectScrollBar from 'perfect-scrollbar';

Expand Down
160 changes: 160 additions & 0 deletions admin-dev/themes/default/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3474054

Please sign in to comment.