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

105892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
9fe4fc6fd4 Merge remote-tracking branch 'origin/master' 2016-04-27 10:15:28 +02:00
Julien ITARD
994b158b68 Translated using Weblate (French) 
Currently translated at 99.5% (3196 of 3211 strings)

[CI skip]
 2016-04-27 10:15:25 +02:00
Michal Čihař
af9ae1dd75 Adjust FAQ to current placement of import 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 10:14:51 +02:00
Weblate
49959e77be Merge remote-tracking branch 'origin/master' 2016-04-27 09:15:23 +02:00
Adam Magnier
247a311f4f Translated using Weblate (French) 
Currently translated at 99.5% (3196 of 3211 strings)

[CI skip]
 2016-04-27 09:15:20 +02:00
Michal Čihař
5b5d5edefb Merge remote-tracking branch 'origin/pull/12039' 2016-04-27 09:14:15 +02:00
Michal Čihař
b33d7f4bd5 Merge branch 'QA_4_6' 2016-04-26 16:37:36 +02:00
Michal Čihař
df08b53e43 Fixed editing of VIEW structure 
Fixes #12171

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 16:37:20 +02:00
Michal Čihař
b90bb0a462 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-04-26 15:55:13 +02:00
Michal Čihař
70c144f200 Merge branch 'QA_4_6' 2016-04-26 15:54:26 +02:00
Michal Čihař
586e238f01 Update SQL parser to 3.4.4 
Revision 1ec169a2a76110bbd0734da23a43c4d23c1eecfb

Fixes #12144
Fixes #12205

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 15:54:04 +02:00
Michal Čihař
0674deeb5b Translated using Weblate (Filipino) 
Currently translated at 0.0% (1 of 3211 strings)

[CI skip]
 2016-04-26 14:56:28 +02:00
Michal Čihař
fecb6c6bd9 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 14:40:47 +02:00
Michal Čihař
3780b08015 Add Filipinese translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 14:40:16 +02:00
Michal Čihař
7b08da151e Merge branch 'QA_4_6' 2016-04-26 12:50:59 +02:00
Michal Čihař
54b38e2999 Share js code for hostname input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
0cd7caee71 Share js code for username input and fix it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Michal Čihař
6fdb046f9b Move javascript code for password to functions.js 
- This allows to share the code
- Also fixed bad references to fields

Fixes #12217

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 12:50:42 +02:00
Madhura Jayaratne
124dc70931 Merge branch 'QA_4_6' 2016-04-26 19:28:22 +10:00
Madhura Jayaratne
71078d61ad Add FAQ on preventing path disclosure 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-04-26 19:24:58 +10:00
Michal Čihař
387c094c94 Merge branch 'QA_4_6' 2016-04-26 10:31:04 +02:00
Michal Čihař
fc8486094c Fixed config tab persistence errors 
The URL hash can get appended php session ID breaking the hash lookup.

Fixes #12215

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-26 10:29:58 +02:00
Παναγιώτης Παπάζογλου
1e9dd9c447 Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-04-26 07:15:06 +02:00
Michal Čihař
785e436567 Migrate missing content from wiki 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-25 15:58:50 +02:00
Michal Čihař
bd19498ed2 Merge branch 'QA_4_6' 2016-04-25 12:49:22 +02:00
Michal Čihař
53a51b953c Document when ssl_verify was added 
Issue #12146

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-25 12:49:00 +02:00
Weblate
5637dfb44b Merge remote-tracking branch 'origin/master' 2016-04-25 06:25:16 +02:00
Adam Magnier
667201efd2 Translated using Weblate (French) 
Currently translated at 99.5% (3195 of 3211 strings)

[CI skip]
 2016-04-25 06:25:13 +02:00
Deven Bansod
7ab850fe0b Merge branch 'QA_4_6' 2016-04-25 09:54:27 +05:30
Deven Bansod
6d02018dc1 ChangeLog entry for #12211 
Fixed #12211 in b12b1ae

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-04-25 09:53:03 +05:30
Deven Bansod
26da637ab4 Merge pull request #12213 from devenbansod/fix_#12211 
ORDER BY clause should include Select subexpressions' names
 2016-04-25 09:50:49 +05:30
Deven Bansod
b12b1ae08a ORDER BY clause should include Select subexpressions' names 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-04-24 20:50:23 +05:30
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