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

96481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chirayu Chiripal
3d5008a05c Merge branch 'QA_4_3' 2014-12-07 14:11:45 +05:30
Chirayu Chiripal
b8e698e22f remove HHVM from allowed failures 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-07 13:58:26 +05:30
Chirayu Chiripal
94a94c05c1 fix tests for HHVM 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-07 13:52:56 +05:30
Marc Delisle
6e9eee5cc6 Merge pull request #1414 from Tithugues/b4593_master 
Fix #4593 Manual SELECT doesn't change active table
 2014-12-06 18:28:11 -05:00
Marc Delisle
fa6ca2a504 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-06 18:27:47 -05:00
Marc Delisle
1b1bc83e1e Merge commit '96c0b6d' 2014-12-06 18:26:12 -05:00
Marc Delisle
e435379efd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-06 18:24:51 -05:00
Weblate
96c0b6d5b9 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-07 00:23:15 +01:00
Aputsiaĸ Niels Janussen
f8c2658a04 Translated using Weblate (Danish) 
Currently translated at 98.0% (2921 of 2978 strings)

[CI skip]
 2014-12-07 00:23:12 +01:00
Marc Delisle
732904f0f2 Merge pull request #1416 from Tithugues/b4593_qa43 
Fix #4593 Manual SELECT doesn't change active table
 2014-12-06 18:23:10 -05:00
Hugues Peccatte
5d911e902d Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:15:23 +01:00
Hugues Peccatte
b5118010c7 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:14:35 +01:00
Hugues Peccatte
ef450c156a Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:13:53 +01:00
Hugues Peccatte
19b9c893fc Fix #4593 Refresh navigation tree on manual select into SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:01:17 +01:00
Hugues Peccatte
35c4dbcaa1 Fix #4593 Refresh navigation tree on manual select into SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:00:34 +01:00
Hugues Peccatte
3f16b312e1 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:27 +01:00
Hugues Peccatte
f5af9d7123 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:26 +01:00
Hugues Peccatte
fc2498361b Add unit test for PMA_Menu::setTable(). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:26 +01:00
Hugues Peccatte
603498a6fc Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:01:55 +01:00
Weblate
fe63e43319 Merge remote-tracking branch 'origin/master' 2014-12-06 13:39:37 +01:00
Domen
e80b030713 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-12-06 13:39:34 +01:00
Aputsiaĸ Niels Janussen
7403332bca Translated using Weblate (Danish) 
Currently translated at 97.9% (2929 of 2991 strings)

[CI skip]
 2014-12-06 13:39:31 +01:00
Hugues Peccatte
d4262e5678 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 13:11:20 +01:00
Hugues Peccatte
5c3b76a374 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 12:58:55 +01:00
Hugues Peccatte
f9eb088bfa Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 12:42:23 +01:00
Hugues Peccatte
3e0796a928 Add unit test for PMA_Menu::setTable(). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 08:54:49 +01:00
Hugues Peccatte
eda24da12e Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 00:57:38 +01:00
Domen
59b500337f Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-05 21:16:51 +01:00
Marc Delisle
20f7402cc5 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-05 12:56:42 -05:00
Marc Delisle
e2c9a90425 Merge branch 'QA_4_3' 2014-12-05 10:10:50 -05:00
Marc Delisle
13bb477377 Merge commit '2741f8b' 2014-12-05 10:10:42 -05:00
Marc Delisle
71f5737c5b 4.3.0 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-05 10:10:10 -05:00
Madhura Jayaratne
d208ea0ed5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-05 20:05:39 +05:30
Madhura Jayaratne
1c78268a7b Update tests. Add meaningful values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 20:03:40 +05:30
Madhura Jayaratne
692e0ae6ae Make pma_quick_warp a class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:31:04 +05:30
Madhura Jayaratne
806178eca2 Upgrade GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:26:54 +05:30
Atul Pratap Singh
04248a22e2 Merge pull request #1411 from madhuracj/update 
jQuery upgrade
 2014-12-05 17:04:05 +05:30
Weblate
d1b487a845 Merge remote-tracking branch 'origin/master' 2014-12-05 12:18:50 +01:00
Igor
c1ed773280 Translated using Weblate (Ukrainian) 
Currently translated at 91.2% (2728 of 2991 strings)

[CI skip]
 2014-12-05 12:18:48 +01:00
Chirayu Chiripal
00c45a2346 merge branch origin/QA_4_3 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:47:24 +05:30
Weblate
2741f8be03 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-05 12:15:59 +01:00
Igor
be806c398c Translated using Weblate (Ukrainian) 
Currently translated at 91.3% (2720 of 2978 strings)

[CI skip]
 2014-12-05 12:15:57 +01:00
Chirayu Chiripal
b900a521de use function_exists for checking function existence 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:36:42 +05:30
Weblate
33175c25ca Merge remote-tracking branch 'origin/master' 2014-12-05 11:43:39 +01:00
Igor
b52605b4fd Translated using Weblate (Ukrainian) 
Currently translated at 90.7% (2713 of 2991 strings)

[CI skip]
 2014-12-05 11:43:37 +01:00
Chirayu Chiripal
9bbc3b7217 Merge branch 'QA_4_3' 2014-12-05 16:11:22 +05:30
Chirayu Chiripal
573f85f1bf Fix bug-4613 HHVM: method ob_gzhandler not found 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:05:48 +05:30
Michal Čihař
e92155b675 Check if set before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:49:38 +01:00
Michal Čihař
61fcf215e5 Detect failure of curl_init 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:20:13 +01:00
Michal Čihař
974295ac85 Silent warning from is_readable 
They emit warning in open_basedir mode.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:09:05 +01:00