Commit Graph

83351 Commits

Author SHA1 Message Date
Lassi Ruonavaara
d370358524 Translated using Weblate (Finnish)
Currently translated at 67.3% (1785 of 2651)
2013-05-13 19:16:16 +02:00
Chanaka Indrajith
78c8b116ab Added missing semicolon 2013-05-12 23:15:59 +05:30
Michal Čihař
13fcfea4b6 Merge pull request #367 from adamgsoc2013/unit_index_ut
add test case for Index::getColumn and PMA_Index_Column
2013-05-12 08:04:51 -07:00
J.M.
7bcd511078 Merge pull request #371 from kasunchathuranga/PEARCompliance
PEAR compliance
2013-05-12 06:10:38 -07:00
Marc Delisle
faef0aa489 Merge pull request #362 from roccivic/operations-layout
Improved layout on db and table operations pages
2013-05-12 05:27:36 -07:00
Marc Delisle
13c6e82551 Fix merge conflicts 2013-05-12 08:18:08 -04:00
Marc Delisle
f67a3cc0e4 Merge commit '1977e02' 2013-05-12 08:16:03 -04:00
Marc Delisle
d3ed9deb4b Merge commit 'aeaaa79' 2013-05-12 08:15:40 -04:00
Marc Delisle
5a31c9eeba Merge commit '8fd07ac' 2013-05-12 08:15:23 -04:00
Marc Delisle
8196d1084c Merge commit 'c1bb060' 2013-05-12 08:15:02 -04:00
Marc Delisle
50161fc47e Merge commit '4724e44' 2013-05-12 08:14:17 -04:00
Marc Delisle
4113d9e98b bug #3915 Import of CSV file (Replace table data with file) with duplicate values 2013-05-12 08:09:02 -04:00
Weblate
1977e02d23 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-12 12:28:45 +02:00
Victor Volkov
9a12fb70e4 Translated using Weblate (Russian)
Currently translated at 100.0% (2607 of 2607)
2013-05-12 12:28:42 +02:00
J.M
aeaaa790d4 fix bug #3925 Table sorting in navigation panel is case-sensitive 2013-05-12 12:19:34 +02:00
Weblate
f147f4117c Merge remote-tracking branch 'origin/master' 2013-05-12 11:09:27 +02:00
Victor Volkov
315b63e9a7 Translated using Weblate (Russian)
Currently translated at 100.0% (2651 of 2651)
2013-05-12 11:09:22 +02:00
Rouslan Placella
24ccd70759 Merge pull request #365 from m0hamed/refactor
fix warning for uninitialised variables
2013-05-12 02:09:05 -07:00
Kasun Chathuranga
7c80023baf Add documentation comments to the methods of PMA_Index_Column class 2013-05-12 09:21:21 +05:30
Kasun Chathuranga
636b0c4b7d Align function parameters correctly 2013-05-12 09:02:03 +05:30
Kasun Chathuranga
2ecc23cb70 Opening curly braces of the function should not be in a separate line 2013-05-12 09:01:17 +05:30
Kasun Chathuranga
6f1d99b9b5 Indent parameters correctly 2013-05-12 08:59:55 +05:30
Kasun Chathuranga
67c0de69e8 Fix line exceeding 80 characters 2013-05-12 08:58:35 +05:30
Kasun Chathuranga
5b5f01a101 Align documentation comments 2013-05-12 08:56:25 +05:30
Kasun Chathuranga
03fc9b9256 PMA_is_system_schema --> PMA_isSystemSchema 2013-05-12 08:51:54 +05:30
Kasun Chathuranga
264454f2dd PMA_usort_comparison_callback --> PMA_usortComparisonCallback 2013-05-12 08:49:51 +05:30
Kasun Chathuranga
f247e4ace6 Make documentation comments PEAR compliant 2013-05-12 08:46:22 +05:30
Weblate
418b39437a Merge remote-tracking branch 'origin/master' 2013-05-11 20:12:46 +02:00
Marek J
15dc75c68b Translated using Weblate (Slovak)
Currently translated at 72.5% (1922 of 2651)
2013-05-11 20:12:41 +02:00
Marc Delisle
c739a76af1 Merge pull request #341 from hisamith/refactor_tbl_structure
Refactored tbl_structure.php by extracting mathods
2013-05-11 11:12:31 -07:00
J.M
c1bb060ee3 center loading indicator for navigation refresh, related to bug #3920 2013-05-11 16:18:55 +02:00
Weblate
8fd07ac7ca Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-11 16:18:39 +02:00
Marek J
4724e4420b Translated using Weblate (Slovak)
Currently translated at 75.4% (1965 of 2607)
2013-05-11 16:18:36 +02:00
Marc Delisle
82e01874ad Merge pull request #350 from xmujay/xmujay_refactor_serview
refactor server_engines.php, split to small function
2013-05-11 05:04:10 -07:00
Marc Delisle
e5c00797bf Add missing variable (yes there is a one-line duplication) 2013-05-11 07:53:39 -04:00
Marc Delisle
9966cedcde Fix merge conflicts 2013-05-11 07:34:09 -04:00
Rouslan Placella
51d88264fc Improved layout on db and table operations pages 2013-05-11 12:06:27 +01:00
Weblate
d0ad2b332c Merge remote-tracking branch 'origin/master' 2013-05-11 13:03:47 +02:00
JP KAN
405fc5d0b7 Translated using Weblate (Portuguese)
Currently translated at 48.8% (1293 of 2651)
2013-05-11 13:03:41 +02:00
Marc Delisle
066b57548b Merge branch 'QA_4_0' 2013-05-11 07:02:55 -04:00
Marc Delisle
e67dfb8a14 Merge commit '2d9ca26' 2013-05-11 07:02:48 -04:00
Marc Delisle
75205f1675 Merge branch 'MAINT_4_0_1' into QA_4_0 2013-05-11 06:54:24 -04:00
Marc Delisle
ea596b07eb ChangeLog entry for bug #3918 2013-05-11 06:54:13 -04:00
adamgsoc2013
74180c0ffc fix the undefined index, it is the function of PMA_Index 2013-05-11 11:45:01 +08:00
adamgsoc2013
c9e4adf2ae add test case for Index::getColumn and PMA_Index_Column 2013-05-11 11:36:18 +08:00
Mohamed Ashraf
200e22ad4b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into refactor 2013-05-10 22:36:23 +02:00
Mohamed Ashraf
ddaff8aba7 Fixed warning for unintialized variable 2013-05-10 22:31:26 +02:00
Michal Čihař
e8de59d97b Missing semicolon 2013-05-10 14:29:10 +02:00
Weblate
ed2b12f48e Merge remote-tracking branch 'origin/master' 2013-05-10 14:03:21 +02:00
Jan Erik Zassenhaus
9fed7c75c0 Translated using Weblate (German)
Currently translated at 96.5% (2557 of 2651)
2013-05-10 14:03:15 +02:00