gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,625 Commits 12 Branches 481 Tags 2.4 GiB
2f3360993f
Commit Graph

104625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
2f3360993f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:30:37 -05:00
Marc Delisle
6d399342ce Merge commit '19085e7' 2016-01-16 08:28:43 -05:00
Marc Delisle
7d4c570b76 Undefined index: is_ajax_request 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 08:27:11 -05:00
Weblate
c12d6fc25c Merge remote-tracking branch 'origin/master' 2016-01-16 13:16:53 +01:00
Domen
1307a4db30 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-16 13:16:52 +01:00
Marc Delisle
8152201fb9 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-16 07:16:41 -05:00
Domen
19085e7f77 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-16 01:16:53 +01:00
Marc Delisle
8d117ac3fa 4.5.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 16:53:26 -05:00
Marc Delisle
206a52136e Merge commit '0f7927e' 2016-01-15 16:52:56 -05:00
Weblate
7dfaeead42 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 22:52:39 +01:00
Burak Yavuz
732274b34c Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 22:52:38 +01:00
Xosé Calvo
a8d866a746 Translated using Weblate (Galician) 
Currently translated at 86.2% (2769 of 3210 strings)

[CI skip]
 2016-01-15 22:52:37 +01:00
Marc Delisle
0f7927e16f 4.5.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 16:52:26 -05:00
Weblate
03882ea74b Merge remote-tracking branch 'origin/master' 2016-01-15 22:40:47 +01:00
Burak Yavuz
793e224eef Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-15 22:40:46 +01:00
Xosé Calvo
7ab0251393 Translated using Weblate (Galician) 
Currently translated at 85.3% (2747 of 3219 strings)

[CI skip]
 2016-01-15 22:40:43 +01:00
Isaac Bennetch
8db478c403 ChangeLog entry for new ssl_verify directive 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-01-15 16:38:33 -05: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
dingo thirteen
169c6ce49b Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-15 19:19:43 +01:00
Erwin Bronkhorst
dbb267308d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 18:35:14 +01:00
Marc Delisle
0ff1c00d77 Functions used before being defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-15 07:54:24 -05:00
Weblate
af4151e12e Merge remote-tracking branch 'origin/master' 2016-01-15 11:22:13 +01:00
Burak Yavuz
fd37879f29 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-15 11:22:13 +01:00
Giovanni Sora
ab33869a8e Translated using Weblate (Interlingua) 
Currently translated at 72.6% (2338 of 3216 strings)

[CI skip]
 2016-01-15 11:22:12 +01:00
Deven Bansod
62c4bb451d Merge pull request #11858 from devenbansod/add_check_priv_tests 
Refactor check_user_privileges.lib.php and add test cases for 2 functions
 2016-01-15 15:52:05 +05:30
Deven Bansod
35cb1d28b0 Refactor check_user_privileges.lib.php and add test cases for 2 functions in it 
Remove overloads

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 20:35:43 +05:30
Weblate
123484ae72 Merge remote-tracking branch 'origin/master' 2016-01-15 05:39:07 +01:00
kenan akgün
c06cef7a98 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-15 05:39:06 +01:00
Atul Pratap Singh
e14ba6d7ba Merge branch 'QA_4_5' 2016-01-15 10:08:43 +05:30
Atul Pratap Singh
c0a56783de Merge commit '609be25' 2016-01-15 10:08:32 +05:30
Atul Pratap Singh
fc8433290b Merge commit 'd98f57b' 2016-01-15 10:08:17 +05:30
Deven Bansod
d98f57bc5b Fix a typo in condition check 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 14:29:46 +05:30
Atul Pratap Singh
0f20dca587 Merge commit '93e1461' 2016-01-15 10:06:24 +05:30
Atul Pratap Singh
61e5d5f47b Fix #11860 : TypeError: e.handler.apply is not a function 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-15 10:04:23 +05:30
Weblate
609be25b5e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 04:30:19 +01:00
kenan akgün
93e1461e33 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 04:30:18 +01:00
Madhura Jayaratne
32775553df Merge branch 'QA_4_5' 2016-01-15 12:43:41 +11:00
Madhura Jayaratne
516082c3c2 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-15 12:40:44 +11:00
Madhura Jayaratne
ff967d99b8 Fix #11814 SQL comment and variable stripped from bookmark on save 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 12:40:30 +11:00
Madhura Jayaratne
54e403a624 Merge branch 'QA_4_5' 2016-01-15 10:49:39 +11:00
Weblate
61c7c3018a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 00:45:54 +01:00
Stefano Martinelli
4d955255da Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 00:45:52 +01:00
Madhura Jayaratne
4e05d3981a Fix #11854 Undefined property: stdClass::$releases at version check when disabled in config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 10:45:31 +11:00
Deven Bansod
0882bc7f6d Fix correct class name. Use namespaces 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 03:18:27 +05:30
Weblate
9f88c18396 Merge remote-tracking branch 'origin/master' 2016-01-14 17:19:15 +01:00
Domen
70c98536de Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3215 of 3216 strings)

[CI skip]
 2016-01-14 17:19:14 +01:00
Stefano Martinelli
ff406d8481 Translated using Weblate (Italian) 
Currently translated at 99.8% (3213 of 3219 strings)

[CI skip]
 2016-01-14 17:19:13 +01:00
Παναγιώτης Παπάζογλου
ef0528b475 Translated using Weblate (Greek) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-14 17:19:12 +01:00
Παναγιώτης Παπάζογλου
23d4eb9078 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 16:02:19 +01:00
Kristjan Räts
bb71801e6a Translated using Weblate (Estonian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-14 13:12:31 +01:00