webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-11-01 23:14:58 +03:00
Code Activity
107,360 Commits 12 Branches 481 Tags
db4a2e11f473d169b41d00a6668dfd2742e8bd71
Commit Graph

565 Commits

Author SHA1 Message Date
Michal Čihař
e67c066c4e Merge branch 'QA_4_6' 2016-09-26 09:20:25 +02:00
Michal Čihař
b6263ede84 Use example.com as example domain 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:20:08 +02:00
Michal Čihař
23e01d306a Merge branch 'QA_4_6' 2016-08-17 15:38:22 +02:00
Michal Čihař
1099f68c1a Reintroduce PmaAbsoluteUri setting 
It has no affect yet.

Issue #12374

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:14:46 +02:00
Michal Čihař
52f23338a8 Merge branch 'master-security' 2016-08-17 08:50:51 +02:00
Deven Bansod
315f7b3596 Add optional column 'Charset' on Database structure page 
Fix #12162

Add an option to add a Column on Database structure page which shows the charset of each table/view

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-08-08 17:51:16 +05:30
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ř
f5015c2ea3 Merge branch 'QA_4_6-security' into master-security 2016-07-26 16:31:21 +02:00
Michal Čihař
e67e69229a Remove option to show phpinfo() ($cfg['ShowPhpInfo']) 
This is really more a PHP debugging feature than anything related to
phpMyAdmin. If user wants to debug, it's as simple a creating file with
one line of php code.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-23 11:31:46 +02:00
Michal Čihař
fc6ef261eb Remove Swekey support 
It is buggy and their servers are no longer working.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-11 09:02:58 +02:00
Michal Čihař
98ad7d1ba4 Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:42:37 +02:00
Michal Čihař
05a45fe23f Use https for links to bugs.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:41:13 +02:00
Michal Čihař
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
56e59c19f4 Add option to log executed SQL queries to syslog 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-29 11:20:55 +02:00
Michal Čihař
8dbb4544fa Remove $cfg['ThemePath'] 
Fixes #12196

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 11:46:35 +02:00
Michal Čihař
aa077eee78 Merge pull request #11963 from Achilles-96/Issue-11865 
Fixes #11865 partially
 2016-02-22 13:00:55 +01:00
Achilles-96
4073e4676f Fixes #11865 partially-Added support for shortcuts 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-02-22 17:06:23 +05:30
Michal Čihař
2fffee3093 Merge remote-tracking branch 'origin/pull/11986' 2016-02-22 07:56:50 +01:00
chintan zaveri
2b74163914 Removal of Swekey 
Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>

master rebased

Signed-off-by: Chintan Zaveri <zaveri_chintan@rediff.com>
 2016-02-20 21:41:07 +05:30
Michal Čihař
ae1ccf3e6a Remove PmaAbsoluteUri configuration directive 
Fixes #11412

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 17:41:29 +01:00
Michal Čihař
1e9e14d23b Remove ForceSSL configuration directive 
In most setups we simply do not have enough information to decide
whether user has come through HTTPS or not leading to infinite
redirects.

Anyway this is better to handle at web server side together with setting
HSTS headers.

Issue #11412, #11883

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-03 14:20:11 +01:00
Joel Hutchinson
ff014ac34d Added the new SSL check disable flag 
MySQL 5.6 or later requests peer_name validation of the SSL. This causes most self signed certificates to fail validation.
In PMA, you only get a vague 2002 connection error as a result.
As of PHP 5.6.16, a new flag exists to disable the check and allows the
connection to proceed.
See https://bugs.php.net/bug.php?id=68344 and #11838

Signed-off-by: Joel Hutchinson joel.hutchinson@onlinecommercegroup.com
 2016-01-15 16:32:40 -05:00
Achilles-96
f48b5af23c Fixes #11730 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 10:35:29 +05:30
Marc Delisle
e0a1f50ebc Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-04 17:36:24 -05:00
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Marc Delisle
627be94532 Merge branch 'QA_4_5' 2015-08-31 16:55:39 -04:00
Marc Delisle
f3eb388854 Fixes #11448 Clarify doc about the MemoryLimit directive 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-31 16:55:03 -04:00
Marc Delisle
41f58ca580 Clarify explanation for directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-30 08:35:18 -04:00
Madhura Jayaratne
6eb6786506 Standardize to sentence case 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-26 16:57:42 +10:00
Nisarg Jhaveri
b2e8e4660b Create indexes with table creation if "IF NOT EXISTS" is on 
- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-22 02:18:38 +05:30
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Marc Delisle
12e286ca0b Clarify doc for some directives 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-05 15:46:57 -04:00
Marc Delisle
48044b5d48 Merge pull request #1798 from udan11/coding_style 
Miscellaneous coding style fixes
 2015-07-18 17:57:15 -04:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-19 00:18:38 +03:00
Dan Ungureanu
eef994f122 Added lint. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-15 16:48:13 +03:00
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:06:28 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:03:57 +05:30
Deven Bansod
2ff6d53b12 Fixed typos 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-01 13:46:23 +05:30
Madhura Jayaratne
69e1c473de Config option for Export\as_separate_files 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:37:30 +05:30
Nisarg Jhaveri
2fa832ca89 rfe#1557 Hide groups from navi panel 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-23 17:07:02 +05:30
Isaac Bennetch
bb435183a3 Merge pull request #1737 from devenbansod/rfe1060_new 
Designer settings saved in a new table in configuration storage
 2015-06-22 22:42:52 -04:00
Madhura Jayaratne
e0aa1a4c92 #4963 Improve/restore non-unique index row editing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 13:46:18 +05:30
Deven Bansod
54a480e8eb Designer settings saved in a new table in configuration storage 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-21 15:44:39 +05:30
Alexei Yuzhakov
d384a6b432 Ability to contol the minimal MySQL version via config. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-15 08:05:17 +06:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30