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

104386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
05b264564e Simplify indentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:07:29 +01:00
Michal Čihař
e0b1c1643e Close should not fail if open didn't 
Hiding error on close is not needed, this should not happen unless the
system is really in a bad shape.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:05:01 +01:00
Michal Čihař
b66c189caf Document todo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 09:03:00 +01:00
Michal Čihař
a7d2473025 Avoid ignoring error 
There should be no error here as we've queried the result few lines ago.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 08:57:25 +01:00
Michal Čihař
592207946e Merge branch 'QA_4_5' 2016-01-05 08:38:19 +01:00
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
e23ad2e57d Merge remote-tracking branch 'origin/master' 2016-01-05 08:23:16 +01:00
Masahiro Nishi
70b04acf37 Translated using Weblate (Japanese) 
Currently translated at 66.6% (2144 of 3217 strings)

[CI skip]
 2016-01-05 08:23:14 +01:00
Michal Čihař
991df753c7 Merge branch 'QA_4_5' 2016-01-05 08:21:42 +01:00
Michal Čihař
e1c9dec998 Merge commit '912f96114dc803404e2854ebb5796757a4eeedb6' 2016-01-05 08:21:32 +01:00
Michal Čihař
6d83b09840 Merge commit 'b16bec706a99b3058a14baffeef58470e59200a9' 2016-01-05 08:20:52 +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
85d58a7fe8 Translated using Weblate (Japanese) 
Currently translated at 65.9% (2121 of 3217 strings)

[CI skip]
 2016-01-05 01:51:01 +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
Michal Čihař
66234c4521 Merge pull request #11768 from nijel/overload 
Remove /*overload*/ prefix from mb_* calls
 2016-01-04 16:57:06 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Deven Bansod
41caf7bafa Merge branch 'QA_4_5' 2016-01-04 19:43:01 +05:30
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
Marc Delisle
49302ec644 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-04 07:40:11 -05:00
Atul Pratap Singh
e9ec1edaa1 Merge branch 'QA_4_5' 2016-01-04 17:27:54 +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
727b965bbf Merge branch 'QA_4_5' 2016-01-04 17:10:56 +11:00
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
Marc Delisle
6f713baa49 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-03 08:57:26 -05:00
Marc Delisle
3b00a228f2 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-02 10:57:26 -05:00
Marc Delisle
128b4195b1 Merge pull request #11803 from Achilles-96/Issue-11730 
Bug fix for #11746
 2016-01-02 10:46:15 -05:00
Achilles-96
fbe8fbb362 Bug fix for #11746 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2016-01-02 20:18:35 +05:30
Marc Delisle
a68ae54bde Merge branch 'QA_4_5' 2016-01-02 08:51:25 -05: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
Marc Delisle
f15805ef31 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-01 12:00:54 -05:00
Marc Delisle
1be4fc7a99 Refactor duplicated code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-01 12:00:46 -05:00
Weblate
b7d27eab93 Merge remote-tracking branch 'origin/master' 2016-01-01 15:11:43 +01:00
Sebastian Weremczuk
3e64452dc7 Translated using Weblate (Polish) 
Currently translated at 82.7% (2661 of 3217 strings)

[CI skip]
 2016-01-01 15:11:42 +01:00
Bob
9834729348 Translated using Weblate (Korean) 
Currently translated at 77.3% (2489 of 3217 strings)

[CI skip]
 2016-01-01 15:11:42 +01:00
Marc Delisle
acea807ed8 Remove unneeded PHP tag that triggers an Unreachable code warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-01 09:11:31 -05:00
Weblate
6aef0a192e Merge remote-tracking branch 'origin/master' 2015-12-31 14:10:00 +01:00
Sebastian Weremczuk
af58ae43e4 Translated using Weblate (Polish) 
Currently translated at 82.5% (2657 of 3217 strings)

[CI skip]
 2015-12-31 14:09:59 +01:00
Marc Delisle
911f8274c7 Clarify class and variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-31 08:09:47 -05:00
Marc Delisle
746baabd2d Merge pull request #11801 from vnwildman/master 
l10n: Updated Vietnamese translation (2805t412u)
 2015-12-31 04:57:35 -05:00
Deven Bansod
cbb6e3eda0 Merge branch 'QA_4_5' 
Conflicts:
	po/eo.po
	po/li.po
	po/uz@latin.po
 2015-12-31 12:01:10 +05:30
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