gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,279 Commits 12 Branches 481 Tags 2.4 GiB
3e7281e620
Commit Graph

664 Commits

Author SHA1 Message Date
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