Skip to content

Commit f559dc1

Browse files
PeeyushAgrawalPeeyushAgrawal
authored
Merge pull request #4 from PrestaShop/develop
updating the forked repository develop branch
2 parents 04fc010 + b0f8cbe commit f559dc1

4,477 files changed

Lines changed: 231263 additions & 223076 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.docker/Dockerfile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM prestashop/prestashop-git:latest
2+
3+
# To run files with the same group as your primary user
4+
RUN groupmod -g 1000 www-data \
5+
&& usermod -u 1000 -g 1000 www-data
6+
7+
COPY /wait-for-it.sh /tmp/
8+
COPY /docker_run_git.sh /tmp/
9+
10+
CMD ["/tmp/docker_run_git.sh"]

‎.docker/docker_run_git.sh‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#!/bin/sh
2+
3+
if [ ! -f ./vendor/autoload.php ]; then
4+
echo "\n* Vendor autoloader not found, running composer ...";
5+
runuser -g www-data -u www-data -- /usr/local/bin/composer install --no-interaction
6+
fi
7+
8+
if [ "$DB_SERVER" = "<to be defined>" -a $PS_INSTALL_AUTO = 1 ]; then
9+
echo >&2 'error: You requested automatic PrestaShop installation but MySQL server address is not provided '
10+
echo >&2 ' You need to specify DB_SERVER in order to proceed'
11+
exit 1
12+
elif [ "$DB_SERVER" != "<to be defined>" -a $PS_INSTALL_AUTO = 1 ]; then
13+
RET=1
14+
while [ $RET -ne 0 ]; do
15+
echo "\n* Checking if $DB_SERVER is available..."
16+
mysql -h $DB_SERVER -P $DB_PORT -u $DB_USER -p$DB_PASSWD -e "status" > /dev/null 2>&1
17+
RET=$?
18+
19+
if [ $RET -ne 0 ]; then
20+
echo "\n* Waiting for confirmation of MySQL service startup";
21+
sleep 5
22+
fi
23+
done
24+
echo "\n* DB server $DB_SERVER is available, let's continue !"
25+
fi
26+
27+
# From now, stop at error
28+
set -e
29+
30+
if [ ! -f ./config/settings.inc.php ]; then
31+
if [ $PS_INSTALL_AUTO = 1 ]; then
32+
33+
echo "\n* Installing PrestaShop, this may take a while ...";
34+
35+
if [ $PS_ERASE_DB = 1 ]; then
36+
echo "\n* Drop & recreate mysql database...";
37+
if [ $DB_PASSWD = "" ]; then
38+
echo "\n* Dropping existing database $DB_NAME..."
39+
mysql -h $DB_SERVER -P $DB_PORT -u $DB_USER -e "drop database if exists $DB_NAME;"
40+
echo "\n* Creating database $DB_NAME..."
41+
mysqladmin -h $DB_SERVER -P $DB_PORT -u $DB_USER create $DB_NAME --force;
42+
else
43+
echo "\n* Dropping existing database $DB_NAME..."
44+
mysql -h $DB_SERVER -P $DB_PORT -u $DB_USER -p$DB_PASSWD -e "drop database if exists $DB_NAME;"
45+
echo "\n* Creating database $DB_NAME..."
46+
mysqladmin -h $DB_SERVER -P $DB_PORT -u $DB_USER -p$DB_PASSWD create $DB_NAME --force;
47+
fi
48+
fi
49+
50+
if [ "$PS_DOMAIN" = "<to be defined>" ]; then
51+
export PS_DOMAIN=$(hostname -i)
52+
fi
53+
54+
echo "\n* Launching the installer script..."
55+
runuser -g www-data -u www-data -- php /var/www/html/$PS_FOLDER_INSTALL/index_cli.php \
56+
--domain="$PS_DOMAIN" --db_server=$DB_SERVER:$DB_PORT --db_name="$DB_NAME" --db_user=$DB_USER \
57+
--db_password=$DB_PASSWD --prefix="$DB_PREFIX" --firstname="John" --lastname="Doe" \
58+
--password=$ADMIN_PASSWD --email="$ADMIN_MAIL" --language=$PS_LANGUAGE --country=$PS_COUNTRY \
59+
--all_languages=$PS_ALL_LANGUAGES --newsletter=0 --send_email=0 --ssl=$PS_ENABLE_SSL
60+
61+
if [ $? -ne 0 ]; then
62+
echo 'warning: PrestaShop installation failed.'
63+
fi
64+
fi
65+
else
66+
echo "\n* Pretashop Core already installed...";
67+
fi
68+
69+
if [ $PS_DEMO_MODE -ne 0 ]; then
70+
echo "\n* Enabling DEMO mode ...";
71+
sed -ie "s/define('_PS_MODE_DEMO_', false);/define('_PS_MODE_DEMO_',\ true);/g" /var/www/html/config/defines.inc.php
72+
fi
73+
74+
echo "\n* Almost ! Starting web server now\n";
75+
76+
exec apache2-foreground

tests/E2E/.docker/prestashop/wait-for-it.sh renamed to .docker/wait-for-it.sh

File renamed without changes.

‎.eslintignore‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.eslintrc.js‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requ
99

1010
| Questions | Answers
1111
| ------------- | -------------------------------------------------------
12-
| Branch? | develop / 1.7.6.x / 1.6.1.x
12+
| Branch? | develop / 1.7.7.x / 1.7.6.x
1313
| Description? | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc.
1414
| Type? | bug fix / improvement / new feature / refacto / critical
1515
| Category? | FO / BO / CO / IN / WS / TE

‎.github/SECURITY.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Security Policy
2+
3+
The PrestaShop team and community take security bugs in PrestaShop seriously. We appreciate your efforts to responsibly disclose your findings
4+
5+
## Supported Versions
6+
7+
Security updates will typically only be applied to the latest release.
8+
9+
## Reporting a Vulnerability
10+
11+
Security issues can be reported by sending an email to security@prestashop.com, which will go to security team members.
12+
The team will send a response indicating the next steps in handling your report.
13+
After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
14+
15+
When the security team receives a security bug report, they will assign it to a primary handler.
16+
This person will coordinate the fix and release process, involving the following steps:
17+
18+
- Confirm the problem and determine the affected versions.
19+
- Audit code to find any potential similar problems.
20+
- Prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
21+
22+
23+
## Disclosure Policy
24+
25+
In general, public disclosure are made after the issue has been fully identified and a patch is ready to be released.

‎.github/main.workflow‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.github/workflows/js.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: JavaScript tests
2+
on: [push, pull_request]
3+
jobs:
4+
eslint:
5+
runs-on: ubuntu-latest
6+
name: ESLint
7+
steps:
8+
- uses: actions/checkout@v1
9+
with:
10+
fetch-depth: 0
11+
12+
- name: Setup Node
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: '10.x'
16+
17+
- run: cd ./admin-dev/themes/new-theme && npm install && npm run lint

‎.gitignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,28 @@ tests-legacy/resources/modules/referralprogram/
9393
!/admin-dev/export/.htaccess
9494
!/admin-dev/export/index.php
9595

96+
# Downloaded RTL files
97+
/admin-dev/themes/default/css/bundle/default_rtl.css
98+
/admin-dev/themes/default/css/bundle/shared_rtl.css
99+
/admin-dev/themes/default/css/font_rtl.css
100+
/admin-dev/themes/default/css/overrides_rtl.css
101+
/admin-dev/themes/default/css/vendor/font-awesome/font-awesome_rtl.css
102+
/admin-dev/themes/default/css/vendor/nv.d3_rtl.css
103+
/admin-dev/themes/default/css/vendor/titatoggle-min_rtl.css
104+
/admin-dev/themes/default/public/theme_rtl.css
105+
/admin-dev/themes/default/public
106+
/admin-dev/themes/new-theme/css/module/drop_rtl.css
107+
/admin-dev/themes/new-theme/css/right-sidebar_rtl.css
108+
/admin-dev/themes/new-theme/public
109+
96110
themes/*/cache/*
111+
themes/core.js.map
112+
themes/core.js
113+
97114

98115
# Config
99116

117+
config/defines_custom.inc.php
100118
config/settings.inc.php
101119
config/settings.old.php
102120
config/xml/*
@@ -112,8 +130,10 @@ modules/*
112130
override/*
113131
themes/*/
114132
!themes/classic
133+
themes/classic/assets
115134
!themes/_core
116135
!themes/_libraries
136+
themes/classic/assets/css/*_rtl.css
117137

118138
# Vendors and dependencies
119139

@@ -292,3 +312,6 @@ nb-configuration.xml
292312
### Release creation ###
293313
tools/build/releases/*
294314
!tools/build/releases/.gitkeep
315+
316+
## Docker configuration
317+
install.lock

0 commit comments

Comments
 (0)