Commit Graph

914 Commits

Author SHA1 Message Date
William Desportes
cb1328dd43
Copy jquery-fullscreen-plugin from npm package
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
185b29e94f
Copy jquery-debounce-throttle from npm package
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
3043f85942
Copy jquery-ui-timepicker-addon from npm package
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
3ab97d51ba
Rename 1.3 to 2.0 for jquery.ba-hashchange
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
50c2e4a897
Copy jquery.ba-hashchange from npm package
Ref: https://github.com/cowboy/jquery-hashchange/pull/51

2.0.0 version drops IE support

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
6025fee5e4
Copy jquery.event.drag.js from npm package and apply a patch onto it
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
7f85a4f4d7
Use jquery-uitablefilter package and sync vendor file
Ref: https://github.com/gregwebs/jquery-uitablefilter/pull/13
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
db7a755134
Make the sync script exclude some un-replaceable files and remove ll the other ones
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
b529f7cf52
Update jqplot vendor files from dist
Last update: 33f8d3d3f8
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
db646baff5
Update jquery debounce plugin
Was added by: 9db53f4c02
Last update of jquery-Timepicker-Addon: 33f8d3d3f8
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
23111e3c3d
Update jquery-tablesorter and use tablesorter dependency
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
61c5589320
Add blueimp-md5 dependency and update jquery md5
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
410996a5f3
Improve the vendor JS sync script and include u2f-api-polyfill
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-05-03 23:48:12 +02:00
William Desportes
3d24204052
Remove psalm.xml and psalm-baseline.xml files from vendor versions
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-28 23:38:09 +02:00
William Desportes
4c89859462
Improve the vendor JS sync script and include jquery-mousewheel, js-cookie, jquery-validation, tracekit
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-12 00:14:13 +02:00
William Desportes
ec083ae177
Add zxcvbn map file to JS update script and add to vendor directory
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-11 22:33:40 +02:00
William Desportes
5ce5864abc
Add zxcvbn to JS update script
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-11 22:31:37 +02:00
William Desportes
b557a9aa6a
Add more vendors to the JS sync vendor script
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-04-11 22:25:24 +02:00
William Desportes
ecba412eda
Add a warning and exit code 1 when de-dependencies are not installed
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
c6301a1542
Add routing cache warmup to warm up command
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
5044600e3a
Add --optimize-autoloader
Ref: https://getcomposer.org/doc/articles/autoloader-optimization.md
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
24c67f46cb
Add back dev vendors in create-release script before warm up
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
a06d25962a
Add / for branch names in create-release.sh script
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
09d1f86360
Update create-release.sh script
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-28 10:38:11 +01:00
William Desportes
81a2504780
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 23:41:17 +01:00
William Desportes
166938b318
Fix #16033 - remove bin files from non source version of phpMyAdmin
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-19 21:58:38 +01:00
William Desportes
c4455c9c12
Add a script to sync some JS vendor files after upgrades
Ref: #12677
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-14 00:08:09 +01:00
William Desportes
63c4e3b639
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-12 13:57:08 +01:00
William Desportes
f12364b8fd
Fix update-po command (sed) on MacOSX
[ci skip]
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-12 13:54:46 +01:00
William Desportes
e9e7696962
Improve update-po script and add match-twig-cache script
- Make update-po script return the same order on all workstations
- Make it work on MacOSX
- Remove .phtml extension
- Exclude node_modules folder
- match-twig-cache is made to replace templates by the real file and --reverse way
- this change is made so the order is kept between po files updates

I want to stop unreadable diffs between po files updates. 

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-12 13:10:27 +01:00
William Desportes
cf0e0867b1
Merge branch 'QA_5_0'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-05 21:19:57 +01:00
William Desportes
ce85e5ee13
Remove json logging for nocoverage phpunit xml file and remove useless file
Ref: 3b3fbaefdb

Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-03-05 21:18:09 +01:00
Maurício Meneghini Fauth
27d631e164 Use Console command for Twig cache warm up
Extracts the Twig cache generation to a console command.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2020-02-20 23:15:40 -03:00
William Desportes
703b16eace
#15331 - add environment config on twig cache generator
Signed-off-by: William Desportes <williamdes@wdes.fr>
2020-01-16 21:47:01 +01:00
Maurício Meneghini Fauth
f0d4122977
Merge pull request #15505 from mauriciofauth/scripts-console
Add a console tool
2019-10-24 16:18:37 -03:00
Maurício Meneghini Fauth
6f0f7420b0
Merge pull request #15500 from mauriciofauth/bootstrap-theme
Add the Bootstrap theme for phpMyAdmin
2019-10-16 16:20:22 -03:00
Maurício Meneghini Fauth
adea61314e Add a console tool
Adds a console tool for phpMyAdmin using the symfony/console component
and moves the advisor2po script to the the console tool.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 22:04:26 -03:00
Maurício Meneghini Fauth
cf031eacff Merge branch 'QA_5_0'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:55:05 -03:00
Maurício Meneghini Fauth
cc50cf178e Merge branch 'QA_4_9' into QA_5_0
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:51:03 -03:00
Maurício Meneghini Fauth
cf4d6de840 Fix advisor2po script
Related to 88821f8248

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-11 12:34:34 -03:00
Maurício Meneghini Fauth
c385995461 Add the Bootstrap theme for phpMyAdmin
Bootstrap theme uses the default styles from Bootstrap and initially
based on the pmahomme theme.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-10-09 10:47:22 -03:00
Maurício Meneghini Fauth
a958569564 Remove Server\Privileges::formatPrivilege method
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-07 11:55:59 -03:00
Maurício Meneghini Fauth
1a14b3e4d3 Remove vim modelines
These settings are no longer required as they are guaranteed through
other coding standard tools.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-09-02 09:43:21 -03:00
Maurício Meneghini Fauth
064e5eef0a Use Collation value object when possible
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-28 23:01:30 -03:00
Maurício Meneghini Fauth
e99f3ace5c Move DbiDummy extension to the test directory
DbiDummy extension is only used for testing purposes

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-28 18:00:36 -03:00
Maurício Meneghini Fauth
e3d2ae86ad Make generate-twig-cache compatible with Twig 2
Related to #15313

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-19 13:35:30 -03:00
Isaac Bennetch
ca5e5ce197
Merge pull request #15333 from mauriciofauth/create-release
Add ignored files and version check in create-release.sh
2019-06-17 18:10:51 -04:00
Isaac Bennetch
a96f92c43c Shellcheck fixes to set-version
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-17 18:10:12 -04:00
Maurício Meneghini Fauth
fb9a7f8dc7 Add version check for package.json in create-release.sh
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-15 15:43:22 -03:00
Maurício Meneghini Fauth
a45651ae62 Remove some test suite files from release
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-06-15 15:43:22 -03:00
Isaac Bennetch
69e1011ae6 Improve create-release script to handle QA branches higher than QA_4_8.
When we first added this bit, we intended to make QA_4_8 the LTS branch,
but have added QA_4_9 since then.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2019-06-05 21:50:13 -04:00
Maurício Meneghini Fauth
71208bab74 Require PHP 7.1.3
Related to c32e22d3bf

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-04-16 17:20:13 -03:00
Maurício Meneghini Fauth
ef7c18b6df Remove PHP closing tag from libraries/language_stats.inc.php
Use short syntax for the array

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2019-03-15 15:41:03 -03:00
Maurício Meneghini Fauth
a2f9d98455 Fix scripts/generate-twig-cache ROOT_PÀTH
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2019-01-09 21:56:50 -02:00
Isaac Bennetch
5f27add073 Add version handling for the dev packages in Composer when creating the release.
This parses the required dependency versions from composer.json and installs them manually as required packages.

Fixes #14782

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-20 18:36:04 -05:00
Isaac Bennetch
f5c7c3d58d Slight improvement to release documentation
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-12-11 09:39:15 -05:00
Isaac Bennetch
39474a63ae Fix a problem where the script to create new releases used a set of improper Composer requirements for QA_4_8 releases.
Fixes phpmyadmin/website#82

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-11-13 14:24:30 -05:00
Maurício Meneghini Fauth
8a7d18df9c Upgrade pragmarx/google2fa to v4
Add pragmarx/google2fa-qrcode v1

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-10-10 15:11:15 -03:00
Maurício Meneghini Fauth
9a6caac300 Fix generate-twig-cache script
[CI skip]

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-09-17 18:57:15 -03:00
Maurício Meneghini Fauth
7a30eb2907 Fix scripts/generate-twig-cache PHP error
Removes deleted Twig extensions

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-08-18 16:00:35 -03:00
Isaac Bennetch
8674316321 Add a helper script to automate most of the work when changing version numbers
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-08-16 12:55:36 -04:00
Maurício Meneghini Fauth
0665674512
Merge pull request #14317 from laps15/extension_removal
Extension removal
2018-05-29 21:24:14 -06:00
Leonardo Strozzi
5d0fd81e67 Remove Twig php function extensions
Signed-off-by: Leonardo Strozzi <laps15@inf.ufpr.br>
2018-05-29 23:06:31 -03:00
Maurício Meneghini Fauth
1c097a90eb Update Twig to v2.4
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-28 20:52:50 -03:00
Isaac Bennetch
0785c57904 Add reminder to push STABLE
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-05-27 06:42:20 -04:00
Maurício Meneghini Fauth
af148ad92b Enable strict mode in PHP files
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-05-16 04:36:04 -03:00
Isaac Bennetch
2efd1a3e46 Release documentation: encourage signing Docker releases
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-04-19 10:22:35 -04:00
Michal Čihař
0faa940bae Add missing espacing to sed regexp
Signed-off-by: Michal Čihař <michal@cihar.com>
2018-04-18 15:45:19 +02:00
Michal Čihař
66e4c3de68 Make create-release script compatible with QA_4_8
The version in master is supposed to handle all supported branches.

See https://github.com/phpmyadmin/docker/issues/157

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-04-18 15:43:12 +02:00
Maurício Meneghini Fauth
1a107ac92e Upgrade to PHP 7.1
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-04-11 20:23:56 -03:00
Isaac Bennetch
2be772e5a8 Improve and update build instructions
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-03-05 19:01:32 -05:00
Maurício Meneghini Fauth
821d33704c
Merge pull request #14040 from mauriciofauth/issue-13918
Add Yarn install to create-release script
2018-03-03 15:27:36 -03:00
Isaac Bennetch
0664827c3c Fix typo in create-release.sh help
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-27 23:04:53 -05:00
Maurício Meneghini Fauth
9ccd3f0779 Add Yarn to create-release script
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2018-02-22 18:23:52 -03:00
Isaac Bennetch
0076bf8636 Update upload script for new hostname
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2018-02-20 23:38:29 -05:00
Michal Čihař
22c54590be Merge branch 'QA_4_7' 2018-01-16 12:09:02 +01:00
Michal Čihař
009246e96a Force PHP platform in composer to oldest supported version
This way the packages should be compatible with all versions we support
regardless PHP version used to build the release.

Fixes #13831

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 18:00:41 +01:00
Michal Čihař
d070e4a60f Merge branch 'QA_4_7' 2018-01-08 17:14:06 +01:00
Michal Čihař
2ceb2419a3 Sign only generated files on release
Fixes #13885

Signed-off-by: Michal Čihař <michal@cihar.com>
2018-01-08 17:13:41 +01:00
Michal Čihař
11d236b2ea Merge branch 'QA_4_7' 2017-12-15 09:49:25 +01:00
Michal Čihař
dc0e9a5c45 Restore worktree for composer.lock removal on release
The worktree is previously cleaned up, so it can't be reused.

Fixes #13613

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-12-15 09:48:21 +01:00
Maurício Meneghini Fauth
5fc6631b8f Use template for displayUntrackedTables method
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-12-10 11:42:53 -02:00
Maurício Meneghini Fauth
fe62e84062 Use PSR-4 for Twig classes
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-11-30 16:33:26 -02:00
Michal Čihař
8ef504da91 Remove line counts logic from the error reporting component
We no longer need this as we download js files directly, so the client
has correct filename and line immediatelly.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-29 15:09:43 +01:00
Michal Čihař
80e90bfb7b
Merge pull request #13706 from mauriciofauth/jquery-src
Remove jQuery and jQuery UI sources from repository
2017-11-28 11:02:01 +01:00
Michal Čihař
cedad5f931 Remove sprites from the themes
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-13 14:12:12 +01:00
Michal Čihař
f7d2997d79 Use php for fixing line information in the Gettext files
The debug information actually maps ranges, not individual lines, so it
needs more logic.

Also the sed was really slow (as it had to replace all lines).

Issue #13344

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-02 14:00:00 +01:00
Michal Čihař
5a2a115e88 Include correct line information in Gettext files for twig templates
Fixes #13344

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-02 13:31:27 +01:00
Maurício Meneghini Fauth
96ba136b44
Merge pull request #13785 from mauriciofauth/templates
Port templates to Twig and remove PHP templates support
2017-11-02 00:04:02 -02:00
Michal Čihař
540b78dc2e Add support for FIDO U2F authentication
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-01 16:34:31 +01:00
Michal Čihař
869131f59c Add support for HOTP and TOTP authentication
This supports Google Authenticator and similar applications.

Issue #6197

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-01 16:34:18 +01:00
Maurício Meneghini Fauth
9b653cbba3 Port table/relation/common_form template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-29 16:46:52 -02:00
Maurício Meneghini Fauth
246769a979 Port columns_definitions/transformation to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-25 09:52:30 -02:00
Maurício Meneghini Fauth
c244264092 Port table/structure/display_structure to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-23 11:31:58 -02:00
Maurício Meneghini Fauth
e0900ecc98 Remove jQuery UI source code
The jquery-ui package includes source code, which makes it unnecessary to
include the source code in the repository.

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-20 10:55:18 -02:00
Maurício Meneghini Fauth
fa5c45444e Port columns_definitions/partitions to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-17 22:55:24 -02:00
Maurício Meneghini Fauth
973e30f6da Port database/designer/schema_export to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-12 10:26:25 -03:00
Maurício Meneghini Fauth
98e825aecc Port database/structure/show_create_row to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-11 21:46:13 -03:00
Maurício Meneghini Fauth
1a33f062de Port zoom_result_form template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-05 12:08:27 -03:00
Maurício Meneghini Fauth
1ffa2e1b77 Port table/search/input_box template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-10-05 12:08:27 -03:00
Maurício Meneghini Fauth
ce4d28ab32 Port privileges/global_priv_table template to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-09-20 21:27:53 -03:00
Michal Čihař
1285eb9247 Merge branch 'QA_4_7' 2017-08-25 07:42:17 +02:00
Michal Čihař
eddbfcd77c Make the class name version independent
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-08-25 07:41:46 +02:00
Maurício Meneghini Fauth
85866598e5 Move Twig classes to PhpMyAdmin namespace
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-07-20 12:19:48 -03:00
Michal Čihař
5d9056367c Fix path to Config.php in master
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-18 13:31:50 +02:00
Michal Čihař
d463309502 Merge branch 'QA_4_7' 2017-07-18 10:05:13 +02:00
Michal Čihař
c73f451cde Always cleanup composer file
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-07-18 10:05:09 +02:00
Michal Čihař
f0e92a9bfd Sync script with master
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-30 13:19:26 +02:00
Maurício Meneghini Fauth
13c0f7bc3c Move classes to PhpMyAdmin namespace
- Move Advisor to PhpMyAdmin namespace
- Move Bookmark to PhpMyAdmin namespace
- Move Charsets to PhpMyAdmin namespace
- Move Config class to PhpMyAdmin namespace
- Move Console class to PhpMyAdmin namespace
- Move Core to PhpMyAdmin namespace
- Move DatabaseInterface to PhpMyAdmin namespace
- Move DbList to PhpMyAdmin namespace
- Move DbQbe to PhpMyAdmin namespace
- Move DbSearch to PhpMyAdmin namespace
- Move DisplayResults to PhpMyAdmin namespace
- Move Encoding to PhpMyAdmin namespace
- Move Error to PhpMyAdmin namespace
- Move ErrorHandler to PhpMyAdmin namespace
- Move File to PhpMyAdmin namespace
- Move Font to PhpMyAdmin namespace
- Move Footer to PhpMyAdmin namespace
- Move Header to PhpMyAdmin namespace
- Move Index to PhpMyAdmin namespace
- Move IndexColumn to PhpMyAdmin namespace
- Move LanguageManager to PhpMyAdmin namespace
- Move Language to PhpMyAdmin namespace
- Move Linter to PhpMyAdmin namespace
- Move ListAbstract to PhpMyAdmin namespace
- Move ListDatabase to PhpMyAdmin namespace

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-28 21:17:18 -03:00
Maurício Meneghini Fauth
555156c85f Move openlayers to js/vendor
Move js/openlayers to js/vendor/openlayers

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-14 01:57:26 -03:00
Maurício Meneghini Fauth
61b7d5dfd8 Move js/jquery to js/vendor/jquery
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-14 01:57:25 -03:00
Maurício Meneghini Fauth
e330402b5b Refactor the core functions into static methods
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-06-03 00:52:22 -03:00
Michal Čihař
87fd00915a Remove composer.lock after tagging release
We really want this file only on tags and not elsewhere.

Fixes #13346

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-02 09:53:05 +02:00
Michal Čihař
c4380018a7 Avoid .gitignore modification when commiting composer.lock
With --force we can add files which would be ignored.

Issue #13346

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-06-02 09:51:36 +02:00
Maurício Meneghini Fauth
093ed72698 Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-30 22:33:25 -03:00
Michal Čihař
9d1b49ae65 Improve extracting translatable strings from Twig templates
- use separate (clean) directory to avoid messing up with stale cache
  data or other files in the temporary dir
- restore filenames for twig templates in Gettext files, the lines still
  don't match, but at least the filename is correct
- extract the _gettext function as well

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-17 09:23:59 +02:00
Michal Čihař
6479c830c4 Make sure that daily snapshots are from latest update
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-15 10:58:28 +02:00
Maurício Meneghini Fauth
113c120088 Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-12 01:26:49 -03:00
Michal Čihař
6e9fc50304 Run tests during daily builds
To ensure we will not ship something broken.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 14:11:37 +02:00
Michal Čihař
688fbc0d19 Remove build results if not running in CI mode
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 14:11:11 +02:00
Michal Čihař
b3ee1e56f8 Do not use ant for invoking testsuite
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 14:10:55 +02:00
Michal Čihař
a743cb084e Store metadata on daily release
Store timestamp and git commit, so that this can be later used by
website.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-09 12:53:09 +02:00
Michal Čihař
74ec22e3cf Generate sha256 sums even for snapshots
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 15:07:08 +02:00
Michal Čihař
f6e09f2c6e Remove Twig documentation and tests from package
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 14:38:14 +02:00
Michal Čihař
4ff2c1d1b1 Remove symfony cache tests from the packages
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 14:38:08 +02:00
Michal Čihař
718a4fb9b7 Allow + in version
This will be used for snapshots.

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 14:32:47 +02:00
Michal Čihař
703054a27a Prepare create-release.sh for daily builds
Issue #12821

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 14:28:36 +02:00
Michal Čihař
ae9006e9be Use one temporary directory
Share one directory for Twig cache, SHP import and file uploads.

The code now also validates the cache directory and creates it on the
fly, so it properly detects if the directory can not be used.

Also the documentation has been improved to document securing this
directory.

Fixes #13225
Fixes #13226

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-05-05 11:08:36 +02:00
Michal Čihař
61f294062a Merge pull request #13236 from mauriciofauth/templates
Port some templates to Twig
2017-05-04 13:18:36 +02:00
Luís Pedro Algarvio
8e91ad5b35 Implement AUTOLOAD_FILE constant (#13213)
Replace hardcoded paths for autoload.php with vendor defined AUTOLOAD_FILE constant.

Signed-off-by: Luís Pedro Algarvio <lp.algarvio@gmail.com>
2017-05-04 12:24:11 +02:00
Maurício Meneghini Fauth
a35f8798f4 Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-05-03 22:52:39 -03:00
Michal Čihař
f3a4d67347 Merge pull request #13205 from ibennetch/13201-no-gitattributes
Remove .gitattributes files when creating release
2017-04-28 16:32:30 +02:00
Maurício Meneghini Fauth
1b9d125d3e Port some templates to Twig
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-04-20 00:14:06 -03:00
Isaac Bennetch
7fc01204ab Remove .gitattributes files when creating release.
Fixes #13201

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-04-18 14:21:24 -04:00
Michal Čihař
561001eae0 Skip test files when generating template cache
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-10 13:13:41 +02:00
Michal Čihař
fbbbb85c2d Merge pull request #13100 from mauriciofauth/twig-template
Initial support for Twig template engine
2017-04-07 12:41:38 +02:00
Maurício Meneghini Fauth
d71e097593 Add Twig cache generator and bypass escape option
- Add script to generate cache files for all Twig templates
- Add option in Twig extension that bypass autoescaping

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
2017-04-06 20:33:32 -03:00
Michal Čihař
e8104393e0 Merge branch 'QA_4_7' 2017-04-04 08:46:46 +02:00
Michal Čihař
6f9a50f2e7 Do not include devel dependencies in the release
The composer require does automatically run update and thus pulling in
all things we've removed in previous step. Passing --update-no-dev
avoids this.

Fixes #13146

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-04-04 08:45:45 +02:00
Michal Čihař
e4f85624f8 Revert "Remove creating of sha1 for releases"
This reverts commit c768d12a1d.

The sha1 seems to be necessary for composer now.
2017-03-21 11:34:02 +01:00
Michal Čihař
c768d12a1d Remove creating of sha1 for releases
As there is now way to generate collisions (and tar happily ignores
additional payload), using sha1 probably no longer makes sense here.

See https://github.com/phpmyadmin/website/issues/59

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-21 11:29:57 +01:00
Michal Čihař
7d8b1de6ee Merge commit 'f3b44765eca8f3634f3a2574a678f5c503f2335b' 2017-03-02 14:31:12 +01:00
Michal Čihař
cbcad52b0e List longest lasting tests from the json log
Generate JSON report for tests and include it in output

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-03-02 13:31:08 +01:00
Michal Čihař
8322acb641 Merge branch 'QA_4_7' 2017-02-14 17:42:53 +01:00
Michal Čihař
7f9e346a87 Install tcpdf when building release
Signed-off-by: Michal Čihař <michal@cihar.com>
2017-02-14 17:42:34 +01:00
Isaac Bennetch
e00b03a24e Add hint about updating Docker at release time
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2017-02-06 09:20:33 -05:00
Michal Čihař
aa1c65a2c4 Merge pull request #12836 from nijel/source-release
Add source release, strip current ones
2017-01-25 14:02:25 +01:00
Michal Čihař
4b8fe37b05 Remove phpmyadmin vendor from being translated here
Every library should handle localization on it's own.

Fixes #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 14:21:28 +01:00
Michal Čihař
b6468d9b8a Remove po files from sql-parser on creating tarball
Issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
2017-01-23 14:21:23 +01:00
Michal Čihař
2fd4e4b2ae Merge branch 'QA_4_6' 2016-12-19 14:44:25 +01:00
Michal Čihař
53274555b6 Add source release support
See #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:44:20 +01:00
Michal Čihař
b0eb82839b Add source to upload release script
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:43:09 +01:00
Michal Čihař
b567783a24 Remove codecov.yml on release
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:33:08 +01:00
Michal Čihař
0e5cf50467 Add source release support
See #12348

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:29:58 +01:00
Michal Čihař
9dc5cccc1b Remove 7z download option
It does compress worse than tar.xz and experienced users won't have
problems using either of these.

See https://github.com/phpmyadmin/phpmyadmin/issues/12348

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:05:37 +01:00
Michal Čihař
b6b3adf08e Remove .tar.bz2 release
It's almost not downloaded and people usually can choose xz instead
which does compress better.

See https://github.com/phpmyadmin/phpmyadmin/issues/12348

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:04:08 +01:00
Michal Čihař
401ecbdfbe Remove not used option
We use 7z for creating zips for ages, this code was not used for years.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-19 14:02:16 +01:00
Michal Čihař
60ff6f759f Create batch in a temporary file
This should avoid problems described in comments of
421e8b0f54

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-13 07:50:17 +01:00
Michal Čihař
0c5acc9127 Merge branch 'QA_4_6' 2016-12-08 11:42:07 +01:00
Michal Čihař
f2bfa7d745 Avoid running shell scripts as CGI
There is really no reason for that besides misconfigured servers.

This is followup for PMASA-2016-54

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-08 11:41:42 +01:00
Michal Čihař
3059c3021a Do not upload md5 checksums
See https://github.com/phpmyadmin/scripts/issues/4

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-11-24 10:18:43 +01:00
Michal Čihař
aa48806e45 Do not generate MD5 checksum
It's not used anywhere in the website and SHA provides better way to
verify content.

See https://github.com/phpmyadmin/scripts/issues/4

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-11-24 09:28:34 +01:00
Michal Čihař
51a7ea7bf5 Adjust cleanup to changed motranslator deps
See #6363, #11993 and phpmyadmin/motranslator#5

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-13 13:21:18 +02:00
Michal Čihař
c365e79470 Do cleanup of simple-math for release as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-12 17:08:19 +02:00
Michal Čihař
d24848400d Merge branch 'QA_4_6' 2016-10-03 19:28:01 +02:00
Michal Čihař
0a5ab3bfe9 Remove unused script
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-03 19:27:53 +02:00
Michal Čihař
e1d5a1338d Remove outdated script
This is not used on the demo, there is separate one in scripts repo.

Fixes #12605

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-10-03 19:27:03 +02:00
Michal Čihař
3fc7fc0c1b Validate branch and version strings on releasing
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 15:33:10 +02:00
Michal Čihař
91ffece4a8 Sort files in tar by name (issue #12560)
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 14:02:49 +02:00
Michal Čihař
541dbd3a5a Do not store uid in tarballs
Fixes #12560

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-09-16 14:00:50 +02:00
Isaac Bennetch
3cc02ea2a5 Merge pull request #12406 from nijel/sign-tags
GPG sign Git release tags
2016-08-23 10:14:53 -04:00
Michal Čihař
78a93d5a41 Revert "Strip barcodes from TCPDF"
This reverts commit e7517f5144.
2016-08-17 09:59:15 +02:00
Michal Čihař
e7517f5144 Strip barcodes from TCPDF
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-17 09:06:10 +02:00
Michal Čihař
f189f3a08f Remove sRGB.icc when creating release
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-17 09:05:26 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Michal Čihař
4da9da052b Safer ssh configuration
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-03 11:48:53 +02:00
Michal Čihař
95d4f57fed Merge branch 'master' into master-security 2016-08-03 10:03:13 +02:00
Michal Čihař
1de346b3fe Store composer.lock in Git for releases
Once release is created, commit composer.lock to releasing branch, so
that we know what has been shipped there.

Fixes #12408

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-08-02 09:23:40 +02:00
Michal Čihař
360b8e8a11 Merge branch 'master' into master-security 2016-07-28 09:44:08 +02:00
Michal Čihař
d31ff5a1e7 Merge branch 'QA_4_6' into QA_4_6-security 2016-07-28 09:43:26 +02:00
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-28 09:19:13 +02:00
Michal Čihař
10d0ffb871 Enable file sync on sftp
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-28 08:17:36 +02:00
Michal Čihař
e01d58ff4b Merge branch 'QA_4_6' 2016-07-28 08:15:10 +02:00
Michal Čihař
43a199bdca Use single quotes for filename
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-28 08:15:04 +02:00
Michal Čihař
d15490088c Merge branch 'QA_4_6' 2016-07-27 16:30:47 +02:00
Michal Čihař
870ca1cc7a Use https for wiki links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-27 16:28:07 +02:00
Michal Čihař
0aa3b23b41 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:39:59 +02:00
Michal Čihař
77a4d6ed95 Move generator scripts out of the code
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 16:39:40 +02:00
Michal Čihař
6e49998555 Merge branch 'master' into master-security 2016-07-26 16:31:40 +02:00
Michal Čihař
e825b1e401 Generate and upload SHA256 hashes as well
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 12:40:28 +02:00
Michal Čihař
80086020a1 GPG sign Git release tags
This makes it possible to verify that the tag matches what release
manager did release.

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-26 11:15:26 +02:00
Michal Čihař
be70f0c6bf Merge branches 'QA_4_6-security' and 'master' into master-security 2016-07-22 15:48:20 +02:00
Michal Čihař
9bde04b188 Limit what upload script accepts as version
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-22 13:17:54 +02:00
Michal Čihař
6f75f8a261 Merge branch 'QA_4_6-security' into master-security 2016-07-09 09:14:12 +02:00
Michal Čihař
c0b2d56ac0 Use https for wiki links
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-07-09 09:12:43 +02:00
Michal Čihař
7d650bd548 Use phpmyadmin/shapefile instead of embedded bfShapeFile
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-24 15:52:40 +02:00
Michal Čihař
421e8b0f54 Use sftp batch mode for uploading
This way it will correctly fail on error.

Issue #12336

Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-24 10:28:46 +02:00
Michal Čihař
5f8e40941b Do not remove phpseclib's bootstrap file
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-06-06 09:38:42 +02:00
Isaac Bennetch
ba20c9fc7e We no longer need to create MAINT branches for each release; we'll do this on demand from the RELEASE_x_y_z tag if needed.
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
2016-05-26 16:22:37 -04:00