Commit Graph

83377 Commits

Author SHA1 Message Date
Isaac Bennetch
fcd891514e Manually merge ayusun-fr1410 2013-05-16 09:36:36 -04:00
Michal Čihař
712bbac48e Merge pull request #380 from ibennetch/faq1_34
Documentation - fix URL with line break issue
2013-05-13 15:01:59 -07:00
Michal Čihař
f38001d962 Merge pull request #378 from adamgsoc2013/unit_index_ut2
add more test case for PMA_Index
2013-05-13 15:01:26 -07:00
Michal Čihař
a1e711b919 Merge pull request #361 from scnakandala/Bug_3919
Bug #3919 PropertiesIconic not honored fixed
2013-05-13 14:58:22 -07:00
ayusun
0c246a1316 Update Change log for #rfe1410 2013-05-14 03:15:34 +05:30
Marc Delisle
3f2c9466e2 Incomplete change during previous fixing of conflicts 2013-05-13 17:02:48 -04:00
Marc Delisle
e1078c38ee Fix merge conflicts 2013-05-13 16:33:21 -04:00
Marc Delisle
d5add05ba5 Fix merge conflicts 2013-05-13 15:48:21 -04:00
Kasun Chathuranga
a24b4ae33a PMA_Table::analyzeStructure() method to centralize the analysis of the structure of a view/table 2013-05-13 23:11:30 +05:30
Weblate
e5074e3c64 Merge remote-tracking branch 'origin/master' 2013-05-13 19:16:22 +02:00
Lassi Ruonavaara
d370358524 Translated using Weblate (Finnish)
Currently translated at 67.3% (1785 of 2651)
2013-05-13 19:16:16 +02:00
Marc Delisle
0b5ad79701 Merge commit '8a4f44f' 2013-05-13 13:15:43 -04:00
Marc Delisle
886c7e700a Merge commit '837b794' 2013-05-13 13:15:24 -04:00
Marc Delisle
888f9c3854 Fix merge conflicts 2013-05-13 13:14:42 -04:00
Marc Delisle
8a4f44f6eb ChangeLog entry for bug #3898 Structure not refreshed after column drop 2013-05-13 12:59:41 -04:00
Weblate
48c42179f8 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-13 18:57:38 +02:00
Lassi Ruonavaara
837b794723 Translated using Weblate (Finnish)
Currently translated at 70.1% (1827 of 2607)
2013-05-13 18:57:35 +02:00
Marc Delisle
35f12c9ac7 Merge pull request #374 from ayusun/bug3898_att2
Bug fix 3898-Structure/page not refreshed. Updating Table stats
2013-05-13 09:57:26 -07:00
adamgsoc2013
607b9cbc8d fix the assert failure, which is caused by '/n' 2013-05-13 21:08:36 +08:00
adamgsoc2013
2b69375a56 add more test case for PMA_Index 2013-05-13 20:58:50 +08:00
Isaac Bennetch
efcdf8efdc Documentation - fix URL with line break issue 2013-05-13 08:27:42 -04:00
Chanaka Indrajith
78c8b116ab Added missing semicolon 2013-05-12 23:15:59 +05:30
Kasun Chathuranga
839b1a606e Fix bug #3926 View is not updatable 2013-05-12 21:42:48 +05:30
ayusun
db6af26e47 Bug fix 3898-Structure/page not refreshed. Updating Table stats 2013-05-12 21:37:32 +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