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

90562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b1c31dc4e3 Merge pull request #1037 from jeffchan/fix-tests 
Import dependencies to make unit tests friendlier to running independently
 2014-03-10 10:38:06 -04:00
Jeff Chan
607cb3b0b3 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 659efe1a88

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-10 03:26:24 +00:00
Weblate
6748bb9a14 Merge remote-tracking branch 'origin/master' 2014-03-09 22:32:48 +01:00
Yungu Kim
67b5cada36 Translated using Weblate (Korean) 
Currently translated at 69.4% (1912 of 2752)
 2014-03-09 22:32:45 +01:00
Isaac Bennetch
46a7e90a36 Merge pull request #1026 from Dennis1993/patch-1 
Remove 1px border of server info
 2014-03-09 17:32:42 -04:00
Gyeongsu Han
598e88b826 Translated using Weblate (Korean) 
Currently translated at 69.1% (1903 of 2752)
 2014-03-09 15:40:45 +01:00
Tae-rok Hwang
c645004352 Translated using Weblate (Korean) 
Currently translated at 69.1% (1903 of 2752)
 2014-03-09 15:38:03 +01:00
Yungu Kim
16eda044f3 Translated using Weblate (Korean) 
Currently translated at 69.1% (1902 of 2752)
 2014-03-09 15:37:02 +01:00
Marc Delisle
af749a3409 Merge pull request #1035 from jeffchan/fix-database-interface-tests 
Import DatabaseInterface to make unit tests friendlier to running independently
 2014-03-09 07:47:56 -04:00
Marc Delisle
8e066c5105 Merge branch 'QA_4_1' 2014-03-09 07:41:14 -04:00
Marc Delisle
5fdb93de0a Fix comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-09 07:40:33 -04:00
Madhura Jayaratne
22ab13a1dc Merge branch 'QA_4_1' 2014-03-09 14:53:25 +05:30
Madhura Jayaratne
45606abccb bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-03-09 14:51:29 +05:30
Jeff Chan
659efe1a88 Import dependencies to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 840f7b1215

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 08:16:24 +00:00
Madhura Jayaratne
2512ffe513 Merge pull request #1034 from jeffchan/fix-export-tests 
Import export.lib.php to make unit tests friendlier to running independently
 2014-03-09 11:41:56 +05:30
Madhura Jayaratne
821fe48794 Merge pull request #1033 from jeffchan/remove-duplicate-include 
Remove duplicate include_once
 2014-03-09 11:41:45 +05:30
Madhura Jayaratne
44b1e8b8c0 Merge pull request #1032 from jeffchan/fix-tests 
Import gettext include to make unit tests friendlier to running independently
 2014-03-09 11:41:30 +05:30
Jeff Chan
4f241de077 Import export.lib.php to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests in parallel. Currently some tests
fail because not all the dependencies are properly included.

This is similar to 1d58392622

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 05:03:05 +00:00
Jeff Chan
6b0e7d6807 Remove duplicate include_once 
Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 04:55:55 +00:00
Jeff Chan
1d58392622 Import gettext include to make unit tests friendlier to running independently 
The HHVM test runner runs the unit tests parallelly. Currently some tests
fail because not all the dependencies are properly included.

This is similar to this commit 840f7b1215

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-03-09 04:24:51 +00:00
Marc Delisle
3253e4ee4b Merge branch 'QA_4_1' 2014-03-08 17:32:30 -05:00
Marc Delisle
8724d0e9bc Merge commit 'e8be063' 2014-03-08 17:32:24 -05:00
Marc Delisle
b0dfbb9256 Merge commit '32edccc' 2014-03-08 17:32:09 -05:00
Marc Delisle
e8be0639c0 Merge pull request #1020 from krtin/Bug_FIX#4301 
Bugfix4301
 2014-03-08 17:29:58 -05:00
Marc Delisle
eb7cb82b4a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-08 17:29:37 -05:00
Marc Delisle
49d367b1cd Merge pull request #1027 from D-storm/changelog 
ChangeLog Entry
 2014-03-08 06:16:24 -05:00
Chirayu Chiripal
3ab34424fd ChangeLog Entry 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-03-08 03:29:38 +05:30
Dennis1993
27fee4edf6 Remove 1px border of server info 
Signed-off-by: Marvin Wegener mw197@web.de
 2014-03-07 21:46:40 +01:00
Weblate
69e2d84b51 Merge remote-tracking branch 'origin/master' 2014-03-07 21:00:46 +01:00
Cristi Bondarenco
59490eb056 Translated using Weblate (Romanian) 
Currently translated at 52.7% (1453 of 2752)
 2014-03-07 21:00:42 +01:00
Marc Delisle
d101e87cf1 Merge pull request #1023 from D-storm/xhtml-compliance 
made required attribute XHTML compliant
 2014-03-07 15:00:39 -05:00
Chirayu Chiripal
df614c57d4 made required attribute XHTML compliant 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-03-08 01:25:13 +05:30
Marc Delisle
5ea405ef6b Make the "required" attribute XHTML compliant 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-07 13:07:27 -05:00
Marc Delisle
dc4b715222 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-07 13:03:11 -05:00
Marc Delisle
a507784fd6 Merge pull request #1016 from D-storm/FR-1513 
Feature Request #1513
 2014-03-07 12:55:29 -05:00
Marc Delisle
749eba0390 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-07 12:47:40 -05:00
Hugues Peccatte
ff3c08738a Replace the use of MySQL error popup by the standard error popup. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-07 18:39:09 +01:00
Hugues Peccatte
7acd29a295 Fix remove of CSS class 'error' on a new error while using the bookmarked searches. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-07 18:38:23 +01:00
Atul Pratap Singh
369a9ad625 Timestamp field was not being checked 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-07 23:24:38 +05:30
Krtin Kumar
32edccc541 Bugfix4301 
Signed-off-by: Krtin Kumar <krtinkumar@gmail.com>
 2014-03-07 20:52:58 +05:30
Marc Delisle
a73947fba7 Fix "missing operand" complain 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-06 15:29:15 -05:00
Marc Delisle
386c0eff15 4.1.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-06 12:49:01 -05:00
Marc Delisle
caa4e948cf Merge branch 'QA_4_1' 2014-03-06 12:48:19 -05:00
Marc Delisle
50442a2cd8 4.1.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-06 12:47:47 -05:00
Marc Delisle
c7ae964e7d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-06 07:03:28 -05:00
Marc Delisle
24457da563 Merge pull request #1012 from D-storm/FR-1510 
Feature Request #1510 + Check All link Fix
 2014-03-06 07:03:38 -05:00
Michal Čihař
b05ddaaa4f Move IDs to buttons from hidden elements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-06 10:25:00 +01:00
Michal Čihař
a125b33d5f Reintroduce IDs for final yes/no buttons, used in testsuite 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-06 09:55:58 +01:00
Michal Čihař
a8703cc9f1 Changelog entry 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-06 09:34:42 +01:00
Michal Čihař
8224ca09c5 Merge pull request #1010 from D-storm/FR-1511 
Feature Request #1511
 2014-03-06 09:33:49 +01:00