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

102859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
fdcf305834 Fix operator placements and indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:41:48 +01:00
Atul Pratap Singh
e4c194ccde Fix #11821 TypeError: $this_function.val(...) is null 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-05 16:32:22 +05:30
Michal Čihař
cedc7a442c Fix hiding of page content behind menu 
We use jQuery to to the initializaton rather than directly overwriting
onload, which breaks other things,

Fixes #11820, #11812

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 08:35:57 +01:00
Weblate
d6291c2f8f Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-05 08:19:46 +01:00
Masahiro Nishi
e9d3ef465f Translated using Weblate (Japanese) 
Currently translated at 67.4% (2166 of 3210 strings)

[CI skip]
 2016-01-05 08:19:44 +01:00
Michal Čihař
912f96114d Merge pull request #11815 from nijel/dot-database 
Fix handling of databases with dot in a name
 2016-01-05 08:19:39 +01:00
Kiguda Kosuru
b16bec706a Translated using Weblate (Japanese) 
Currently translated at 66.7% (2143 of 3210 strings)

[CI skip]
 2016-01-05 01:50:55 +01:00
Michal Čihař
c197c3fba5 Fix handling of databases with dot in a name 
We do not need to concatenate and parse the items, the cache backend
accepts array directly.

Fixes #11798

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 17:06:58 +01:00
Deven Bansod
63fae992d8 ChangeLog entry for issue #11727 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-04 19:42:23 +05:30
Paweł Kubrak
f1b3beca14 Fix #11727 : SQL duplicate entry error trying to INSERT in designer_settings table 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-04 19:40:38 +05:30
Atul Pratap Singh
0b5e8fd6a3 Move onload navigation state update into AJAX.registerOnload to avoid a glitch 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-04 19:19:49 +05:30
Atul Pratap Singh
5b76c5eddf Fix #11812 Uncaught TypeError: Cannot read property 'parentNode' of null 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2016-01-04 17:26:15 +05:30
Madhura Jayaratne
d9dc442050 issue #11810 'Add to central columns' (per column button) does nothing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-04 17:08:12 +11:00
Weblate
464c31b7ce Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-02 14:51:14 +01:00
Sebastian Weremczuk
31faecba45 Translated using Weblate (Polish) 
Currently translated at 84.1% (2700 of 3210 strings)

[CI skip]
 2016-01-02 14:51:13 +01:00
Bob
c0fca35406 Translated using Weblate (Korean) 
Currently translated at 78.5% (2520 of 3210 strings)

[CI skip]
 2016-01-02 14:51:12 +01:00
Marc Delisle
59fe5e234d Undefined index: host 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-02 08:51:04 -05:00
Deven Bansod
9f5ef70d99 ChangeLog entry for issue 11802 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-31 11:58:53 +05:30
Deven Bansod
23e74f5312 Fix #11802 : undefined index 'field_name_orig' 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-31 11:57:48 +05:30
Michal Čihař
32e79dd2d8 Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.9% (1059 of 3210 strings)

[CI skip]
 2015-12-29 20:32:15 +01:00
Robin van der Vliet
d22482e2a3 Translated using Weblate (Limburgish) 
Currently translated at 1.5% (51 of 3210 strings)

[CI skip]
 2015-12-29 20:32:13 +01:00
Robin van der Vliet
88faa8beb9 Translated using Weblate (Esperanto) 
Currently translated at 15.2% (491 of 3210 strings)

[CI skip]
 2015-12-29 20:32:13 +01:00
Nizomiddin Usmonov
5657f50dda Translated using Weblate (Uzbek (latin)) 
Currently translated at 32.9% (1059 of 3210 strings)

[CI skip]
 2015-12-29 19:20:01 +01:00
Robin van der Vliet
d652103f2d Translated using Weblate (Esperanto) 
Currently translated at 11.3% (363 of 3210 strings)

[CI skip]
 2015-12-29 15:25:05 +01:00
Marc Delisle
9a40c11797 Fixes #11792 Undefined index: parameters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-28 08:15:23 -05:00
Michal Čihař
e405586584 Avoid conversion of MySQL error messages 
The messages are properly encoded based on connection collation. This
seems to be the case since introduction of the collations, but the code
has stayed in phpMyAdmin since the times before it.

Fixes #11788

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 11:49:32 +01:00
Michal Čihař
985bdd11ab Check whether iconv works before using it 
On some systems iconv is installed, but is missing encoding definitions,
what leads to runtime errors when trying to use it. By testing this we
start using it only if it's properly working.

Fixes #11787

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 11:28:03 +01:00
Michal Čihař
87fb774c02 Provide fallback for mb_detect_encoding 
This fix has been already applied to Kanji library, apply it to
php-gettext as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 10:55:17 +01:00
Michal Čihař
6652ed59e7 Fixed Kanji encoding in some specific cases 
The mb_detect_encoding can return false and we have to handle this
situation.

Fixes #11786

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 10:48:31 +01:00
Michal Čihař
1abdeb5741 Set PHP's internal encoding to UTF-8 
Without setting default_charset, user might have set something different
leading to various problems when encoding to html entities.

Fixes #11785

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 10:05:46 +01:00
Weblate
d0532b1c95 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-28 09:20:38 +01:00
João Machaqueiro
003f01f885 Translated using Weblate (Portuguese) 
Currently translated at 54.7% (1756 of 3210 strings)

[CI skip]
 2015-12-28 09:20:37 +01:00
신흥재
97a40d55aa Translated using Weblate (Korean) 
Currently translated at 78.4% (2519 of 3210 strings)

[CI skip]
 2015-12-28 09:20:36 +01:00
Michal Čihař
6768378f71 Properly handle errors in upacking zip archive 
When zip_open fails, we do not have proper handle to use for zip_close.

Fixes #11784

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-28 09:19:28 +01:00
Michal Čihař
218f13d8e0 Avoid syntax error in javascript messages 
If max_input_vars is set to invalid value (eg. 1000M), the generated
javascript is invalid. We fix this by forcing the value to be integer,
what should do the same thing as PHP is doing when parsing this.

Fixes #11783

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-27 10:21:35 +01:00
Michal Čihař
541df24815 Merge remote-tracking branch 'origin/MAINT_4_5_3' into QA_4_5 2015-12-27 10:00:46 +01:00
Deven Bansod
32c6726d68 ChangeLog entry for issue #11777 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-27 10:57:40 +05:30
Deven Bansod
8bd97563b4 Merge pull request #11779 from devenbansod/fix_error_in_11757_correction 
Fix #11777: While 'changing a column', query fails with a syntax error after the 'CHARSET=' keyword
 2015-12-27 10:55:40 +05:30
Weblate
f7f3388653 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-26 15:09:52 +01:00
Thành Phạm
74d27e4fe1 Translated using Weblate (Vietnamese) 
Currently translated at 2.3% (76 of 3210 strings)

[CI skip]
 2015-12-26 15:09:52 +01:00
Marc Delisle
2ae01873ee Table list not saved in db QBE bookmarked search 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-26 09:09:42 -05:00
Deven Bansod
28a5a2693b Fix error in commit : a4f02ca 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-26 13:17:16 +05:30
Marc Delisle
d89a6bda4c 4.5.3.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:51:01 -05:00
Marc Delisle
73544de531 Merge branch 'MAINT_4_5_3' into QA_4_5 2015-12-25 14:48:04 -05:00
Marc Delisle
c4d649325b [Security] Path disclosure, see PMASA-2015-6 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:46:01 -05:00
Weblate
9de6ee383c Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-25 20:35:04 +01:00
Robin van der Vliet
879d843588 Translated using Weblate (Frisian) 
Currently translated at 19.4% (623 of 3210 strings)

[CI skip]
 2015-12-25 20:35:02 +01:00
Robin van der Vliet
7171b0529f Translated using Weblate (Esperanto) 
Currently translated at 11.3% (363 of 3210 strings)

[CI skip]
 2015-12-25 20:35:02 +01:00
Marc Delisle
4cd3597bda Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-25 14:34:50 -05:00
Marc Delisle
09c3375ec2 Merge commit 'a81ac37' into QA_4_5 2015-12-25 14:34:01 -05:00