webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity
123,453 Commits 12 Branches 481 Tags
9dfedff70b3f604f682ee28471544265dcafe20e
Commit Graph

873 Commits

Author SHA1 Message Date
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
Michal Čihař
e191c6eb39 Do not include vendor strings in po files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 14:30:26 +02:00
Michal Čihař
1cd936e7b3 Remove Weblate configuration on release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-16 11:39:16 +02:00
Michal Čihař
317eb54abd Silent errors from git cat-file 
There doesn't seem to be better way to check for existence of file in
branch, so let's just ignore the errors from it.

Fixes #12015

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 13:09:25 +01:00
Michal Čihař
d96bc13f76 Strip motranslator tests from release tarball 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-24 14:39:52 +01:00
Michal Čihař
55fec136f7 Add back SQL parser messages to phpMyAdmin 
Temporary solution until we decide for something better.

See issue #12013

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:21:57 +01:00
Michal Čihař
c81561bac4 Avoid extracting translations from third party libraries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 14:19:46 +01:00
Michal Čihař
2424c41514 Create separate branch for ci tests 
Otherwise we're unable to test pull requests on Travis as they are not
on any branch.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
129b70af9c Use TRAVIS_BRANCH for setup testing if available 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
bbf2e43d67 Cleanup more files on release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
b3fb278ba5 Better cleanup phpseclib from not needed files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
e0c4eef9b6 Improve detection fo Config class filename 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
cb42d787eb Switch to correct captcha library 
The previous one was older from third party, we need to use current from
Google.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
d983803095 Strip composer packages of undeeded files 
We want to produce reasonable sized releases, so let's strip not needed
files.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
aad35d7b22 Propagate test return code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
b622c2066d Add support for running testsuite on the release time 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
602568c132 Create release worktree even if same branch is already worked on 
Also prune stale work trees before creating new one.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
09904cc959 Add safeguard to require branch and version 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
33c5861f94 Improve parsing of option in create-release script 
It no longer depdends on order of specified parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
39c04171f7 Remove cleanup for versions older than 3.5 
These are not supported for quite long time.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
debb613771 Remove support for old style documentation 
None of supported releases uses that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
01f05b52b4 Use git worktrees for creating release 
This way we do not need to do the clone, just add another working tree.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
536dff321f Find out Config class name without doing checkout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:05:49 +01:00
Michal Čihař
38482bfa9f Use Componser autloader for external libraries 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-22 08:03:19 +01:00
Michal Čihař
3d0b33b32f Add templates for new issues and pull requests 
See https://github.com/blog/2111-issue-and-pull-request-templates

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-18 08:28:15 +01:00
Michal Čihař
32e2b1f4fe Merge commit 'f97c3081fe9673b8945d75df2a37af81e0667e4f' 2016-02-17 11:56:59 +01:00
Michal Čihař
f97c3081fe Add missing include 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:55:54 +01:00
Michal Čihař
6d73ee1e4d Merge pull request #11957 from ibennetch/release 
Improve release instructions
 2016-02-12 18:20:57 +01:00
Isaac Bennetch
696556b34b Improve release instructions 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-12 11:03:19 -05:00
Michal Čihař
b805b1d0c2 Let the sprites.lib.php define array instead of function 
This allows us to test this code path without having duplicate function
names.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 14:40:37 +01:00
Michal Čihař
cda50e1a7a Mention changelog completion 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-28 09:34:11 +01:00
Marc Delisle
40644b5c33 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:10:34 -05:00
Marc Delisle
23a70525ae This was related to the previous SQL parser. If someone still needs it 
to decode an old bug report, he/she can still get this script from
an older branch.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:07:52 -05:00
Marc Delisle
881756dd26 Fix library path verification 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-23 08:09:06 -05:00
Michal Čihař
c7cbac1b7a Compatibility to release older versions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-23 13:09:37 +02:00
Hugues Peccatte
f0a5566efe Remove useless include. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-09 22:02:24 +02:00
Marc Delisle
509dbe3481 Fix update-po due to namespace and filename changes 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-09 12:00:21 -04:00
Hugues Peccatte
a5d35d41b6 Revert PMA_String rename. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-14 22:39:03 +02:00
Hugues Peccatte
b1038cfefa Merge branch 'master' into useNamespaces_master 2015-09-04 22:37:45 +02:00
Michal Čihař
08005965d0 Merge branch 'QA_4_4' into QA_4_5 2015-09-04 10:21:14 +02:00
Michal Čihař
51b72ba53c Change address for discussing translations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 10:20:35 +02:00
Michal Čihař
95cc6a5809 Change address for discussing translations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-09-04 10:18:29 +02:00