gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,624 Commits 12 Branches 481 Tags 2.4 GiB
0519eac3ba
Commit Graph

1068 Commits

Author SHA1 Message Date
William Desportes
14d73c1da0
Merge branch 'QA_5_0' into master 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-10-21 13:03:33 +02:00
Isaac Bennetch
60416ddd08 Merge branch 'QA_4_9' into QA_5_0 2019-10-20 23:14:19 -04:00
Isaac Bennetch
6b7aaa7294 More minor language tweaks to bookmark documentation 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-10-20 23:07:06 -04:00
Kesha K. Kaneria
3ac713f83e Sentence formation changed 
Signed-off-by: Kesha K. Kaneria <kesha.kaneria07@gmail.com>
 2019-10-20 23:07:06 -04:00
Maurício Meneghini Fauth
441f8daa1a Use gender-neutral pronouns 
Replaces gender-specific pronouns with gender-neutral pronouns.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-10-18 09:13:08 -03:00
Isaac Bennetch
806a880be6 Prepare for 4.9.2-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-21 00:07:20 -04:00
Isaac Bennetch
a9329ec767 Prepare for version 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-09-20 18:22:47 -04:00
William Desportes
d43e34868b
Merge branch 'QA_5_0' into master 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:44:15 +02:00
William Desportes
d070127c2d
Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:13:06 +02:00
William Desportes
7110206cb9
Fix redirected links in docs 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-09-08 16:09:58 +02:00
Maurício Meneghini Fauth
79298d1a15 Merge branch 'QA_5_0' 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-28 17:25:38 -03:00
Maurício Meneghini Fauth
823408d759 Merge branch 'QA_4_9' into QA_5_0 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-28 17:23:56 -03:00
Maurício Meneghini Fauth
4077c61b2e Remove support for target URL param for FAQ 1.34 
Use the route parameter instead.

https://docs.phpmyadmin.net/en/latest/faq.html#faq1-34

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-08-26 12:23:01 -03:00
Marc Delisle
a4252589af
Clarification 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2019-08-26 09:43:01 -04:00
Maurício Meneghini Fauth
b8aa54c949 Change Media (MIME) type references to Media type 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-07-12 02:06:07 -03:00
Maurício Meneghini Fauth
845091b8ef Merge branch 'QA_5_0' 2019-07-11 22:44:42 -03:00
Maurício Meneghini Fauth
62e8d39445
Merge pull request #15354 from mauriciofauth/media-type 
Change MIME type references to Media (MIME) type
 2019-07-10 23:37:29 -03:00
Isaac Bennetch
20d17644ef Prepare master for 5.1.0-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-07-10 17:44:13 -04:00
Isaac Bennetch
409dd22cbe Reset version number to 5.0.0-dev for ongoing development 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-07-08 22:37:00 -04:00
Isaac Bennetch
7babd6203b Prepare for version 5.0.0-alpha1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-07-08 21:47:33 -04:00
Maurício Meneghini Fauth
4db8ce8cf0 Change MIME type references to Media (MIME) type 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-06-25 03:35:27 -03:00
William Desportes
bc585d97f7
Merge branch 'QA_4_9' 
I missed the sign-off for 180b45f225 and e0889beb52
So the sign-off below is also for them.

Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:42:42 +02:00
johnkershaw
ecad5995ab
country_code is defined as NOT NULL 
Without a country_code for 'Marc' the second step will fail (cannot relate country_code in REL_persons to country_code in REL_countries if the REL_persons record has no value for country_code).

Since this is the whole point of this example it's going to trip people up who're trying to set up relations in phpMyAdmin (like me!)

Co-authored-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: John Kershaw <john@kershaw.org>
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-06-24 21:34:36 +02:00
Isaac Bennetch
e7b73831e5 Prepare for version 4.9.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-04 12:21:25 -04:00
Isaac Bennetch
004848d93f Prepare version 4.9.0.1 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-04 12:05:18 -04:00
Isaac Bennetch
e73c92d92d Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-04 11:47:25 -04:00
Isaac Bennetch
712e4a2d98 Prepare for 4.9.1-dev 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-04 11:34:38 -04:00
Isaac Bennetch
519c32bc08 Prepare for release 4.9.0 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-04 10:45:01 -04:00
Isaac Bennetch
034538e0c6 Update FAQ 4.8 to reflect removing pma_username and pma_password due to the security flaw reported in PMASA-2019-4 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-06-03 21:43:21 -04:00
Maurício Meneghini Fauth
a12911db24 Fix missing requires for PHP 7.1.3 
Related to commit 71208bab74

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-05-29 17:32:53 -03:00
William Desportes
2f2c35c0c2
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-27 21:38:28 +02:00
William Desportes
761a1f623b
Fix #15041 - Update documentation for NavigationLogoLink 
Pull-request: #15124
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-27 21:27:09 +02:00
Ravgeet Dhillon
3e1a6772c5 Update config.rst 
I have done some changes based on the suggestion of members.

Fixes #15041

Signed-off-by: Ravgeet Dhillon <ravgeetdhillon@gmail.com>
 2019-05-27 21:03:07 +02:00
William Desportes
31ab2cb4e8
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-05-11 00:03:16 +02:00
Isaac Bennetch
de01bc333f Standardized spelling/styling of phpMyAdmin name 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-05-10 13:06:12 -04:00
Maurício Meneghini Fauth
cae463f9bf Ignore linkcheck for Scriptalicious 
"500 Server Error: Internal Server Error"

Cherry-picked-from: 54cef387c6

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-25 20:57:15 +02:00
Maurício Meneghini Fauth
54cef387c6 Ignore linkcheck for Scriptalicious 
"500 Server Error: Internal Server Error"

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-22 16:38:10 -03:00
Maurício Meneghini Fauth
c43ba068d2 Remove PHP closing tag from documentation 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
 2019-04-17 21:18:54 -03:00
Michal Čihař
343721e7a3 Merge branch 'QA_4_8' 2019-03-31 10:01:04 +02:00
Michal Čihař
cd7a828ad2 Docs: Update external links 
Fix some permanentnly redirecting external links and remove temporarily
disabled link checks from configureion.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2019-03-31 09:58:10 +02:00
Isaac Bennetch
50bde5c8e1 Merge branch 'QA_4_8' 2019-03-29 03:39:34 -04:00
Isaac Bennetch
95f261b277 Grammar fixes to the bookmark documentation. 
Thanks to Agha Saad Fraz agha.saad04@gmail.com for raising pull request #15025

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-28 18:40:13 -04:00
Isaac Bennetch
704f96fc31 Fix merge conflicts 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-20 11:24:31 -04:00
Isaac Bennetch
e90f7adc02 Improve documentation grammar for two factor authentication section. 
Thanks mostly to Agha Saad Fraz agha.saad04@gmail.com for raising pull
request 15048.

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2019-03-20 11:08:03 -04:00
AghaSaad04
e24467d2d8 Minor grammatical, punctuation bugs (#15021) 
- Minor grammatical, punctuation bugs
- Update vendors.rst, removed some grammatical and punctuation errors from "vendors.rst" file for better understanding

Signed-off-by: William Desportes <williamdes@wdes.fr>
Signed-off-by: Agha Saad Fraz <afraz.bese16seecs@seecs.edu.pk>
 2019-03-14 21:13:52 +01:00
William Desportes
9cd5db0a70
Merge branch 'QA_4_8' 
Closes: https://github.com/phpmyadmin/phpmyadmin/pull/14998
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-06 19:41:43 +01:00
William Desportes
e431695d54
Fix link to shop.trezor.io 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-06 19:40:12 +01:00
Michal Čihař
f8bc1194b2 Merge branch 'QA_4_8' 2019-03-05 13:48:42 +01:00
Michal Čihař
f64b89776e Remove link to my PPA 
It is horribly outdated and I will probably remove it completely.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2019-03-05 13:48:25 +01:00
William Desportes
42e1a333a3
Merge branch 'QA_4_8' 
Signed-off-by: William Desportes <williamdes@wdes.fr>
 2019-03-02 00:22:38 +01:00