gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,859 Commits 12 Branches 481 Tags 2.4 GiB
dcce22b742
Commit Graph

105859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
dcce22b742 Merge branch 'QA_4_6' 2016-04-21 12:11:29 +02:00
Michal Čihař
7e19be3a10 Check if sessions are working and report failures 
- Always check for session_start erorrs and report them, this catches
  completely broken session storage or no free inodes for files
- Check whether session can be written, this catches the full disk case

Fixes #12204

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-21 12:09:50 +02:00
Michal Čihař
d238f2a701 Merge branch 'QA_4_6' 2016-04-21 11:33:43 +02:00
Michal Čihař
9ba7d44c18 Fixed loading of configuration file 
If the loaded configuration is same as the one used, include_once will
not load it.

Fixes #12206

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-21 11:33:08 +02:00
Michal Čihař
fa68cb5fe2 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 12:42:26 +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ř
05c723a4a3 Merge branch 'QA_4_6' 2016-04-20 10:13:44 +02:00
Michal Čihař
f329a38639 Add missing variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 10:13:39 +02:00
Michal Čihař
d014c2893a Merge branch 'QA_4_6' 2016-04-20 10:09:24 +02:00
Michal Čihař
e0724d2660 Fixed check for ndb version 
Fixes #12200

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 10:07:06 +02:00
Michal Čihař
22360b2a3b Merge branch 'QA_4_6' 2016-04-20 09:23:47 +02:00
Michal Čihař
999db1491c Fixed setting of language from user configuration 
Fixes #12202

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 09:13:17 +02:00
Michal Čihař
a0154623b5 Fix wrong merge in composer.json 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 16:39:04 +02:00
Michal Čihař
ce745efb3d Merge branch 'QA_4_6' 2016-04-19 16:26:04 +02:00
Michal Čihař
04b5ae45ec Move coding standard to dev requires 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 16:25:39 +02:00
Michal Čihař
c2419ee951 Merge branch 'QA_4_6' 2016-04-19 16:25:15 +02:00
Michal Čihař
8b29917eca Use coding standard from phpmyadmin/coding-standard 
It is way cleaner to have the coding standard separte and use it when
checking.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 16:22:55 +02:00
Michal Čihař
d019757f64 Merge branch 'QA_4_6' 2016-04-19 16:00:57 +02:00
Weblate
3794b829e3 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-04-19 15:21:00 +02:00
bladerunn3r
0f2897ac80 Translated using Weblate (Polish) 
Currently translated at 82.6% (2655 of 3211 strings)

[CI skip]
 2016-04-19 15:20:59 +02:00
Liška
425a12eff9 Translated using Weblate (Czech) 
Currently translated at 94.4% (3034 of 3211 strings)

[CI skip]
 2016-04-19 15:20:58 +02:00
Michal Čihař
3547b4f074 Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 15:20:43 +02:00
Michal Čihař
72c832cf59 Update SQL parser to 3.4.3 
Revision 84c8ba677d4f27b2a02c9e1bae5e9d0356575338

Fixes #12197

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 15:20:19 +02:00
Weblate
99f73d7aca Merge remote-tracking branch 'origin/master' 2016-04-19 09:06:49 +02:00
bladerunn3r
c8804688f2 Translated using Weblate (Polish) 
Currently translated at 82.2% (2642 of 3211 strings)

[CI skip]
 2016-04-19 09:06:48 +02:00
Liška
8112bb00a5 Translated using Weblate (Czech) 
Currently translated at 94.0% (3019 of 3211 strings)

[CI skip]
 2016-04-19 09:06:47 +02:00
Michal Čihař
f415d7b0eb Replace some disambiguous wikipedia links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 09:06:20 +02:00
Michal Čihař
d94a0adcff Be consistent in linking MySQL manual 
No longer use old links with compatibility redirects...

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 09:03:55 +02:00
Michal Čihař
5302eabb1e Fix link to storage engides doc 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 09:01:48 +02:00
Michal Čihař
9c964b3b41 Correctly link to PHP docs 
Link directly to specific page as the redirect might point to different
location in future (as has happened to the mysql alias).

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 09:01:05 +02:00
Michal Čihař
0fbcbfa049 Fix Suhosin URL 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 08:59:34 +02:00
Michal Čihař
6f179c49b1 Consistent linking to wikipedia 
Always link to the English version and use https.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-19 08:58:40 +02:00
Michal Čihař
2ded53555c Remove non working local link 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 18:17:04 +02:00
Michal Čihař
8aa397b599 Use better links for Suhosin 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:41:59 +02:00
Michal Čihař
2b261afbd6 Fix various broken or outdated links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:30:35 +02:00
Michal Čihař
118682f417 Fix various broken or outdated links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:23:58 +02:00
Michal Čihař
daf5b0d329 Use php.net to link to their website 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:11:15 +02:00
Michal Čihař
4d00c1ff8d Fix some documentation links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:09:53 +02:00
Michal Čihař
683663fb53 Add links to manual based on information from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 17:04:33 +02:00
Michal Čihař
cb2c8ecdf1 Document when settings was changed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:59:25 +02:00
Michal Čihař
83fa69affd Add missing reference to FAQ 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:57:50 +02:00
Michal Čihař
91f3a670c4 Merge branch 'QA_4_6' 2016-04-18 16:39:36 +02:00
Michal Čihař
b4267b2fac Add backlinks to configuration options 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:39:11 +02:00
Michal Čihař
57dce34085 Merge branch 'QA_4_6' 2016-04-18 16:30:01 +02:00
Michal Čihař
4e0ca4601d Document setup with Google Cloud SQL 
Document what needs to be done to connect to Google Cloud SQL.

Fixes #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 16:29:46 +02:00
Michal Čihař
9e2ae0c6ac Merge pull request #12193 from nijel/connect-error 
Do not hide errors from database connection attempts
 2016-04-18 16:29:26 +02:00
Michal Čihař
cfbc31bfa6 Better reporting of connection errors 
We really do not care about traceback or parameters in this case, all we
need is to display the message coming from PHP.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
951f1fed5f Add method to slice errors from the handler 
This can be useful to pop n-last errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
ea428dc860 Make ErrorHandler test more complete 
Actually test handling of stored errors.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00
Michal Čihař
fa1d452e03 Do not hide errors from database connection attempts 
Without these errors it's impossible to figure out what went wrong in
the SSL negotiation. All you get is error 2002 without any means to
diagnose and all important information is issued as PHP warnings.

Issue #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-18 13:32:52 +02:00