gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,379 Commits 12 Branches 481 Tags 2.4 GiB
2a968d96a3
Commit Graph

83379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J.M
2a968d96a3 Merge branch 'origin/QA_4_0' 
Conflicts:
	libraries/server_privileges.lib.php
 2013-05-14 16:10:37 +02:00
J.M
3f7bd7f8a7 Use PEAR standard in PMA_getHtmlForDisplaySelectDbInEditPrivs function name 2013-05-14 16:07:38 +02:00
J.M
e2ea214267 Fix bug #3930 Databases to choose for specific privileges show up escaped 2013-05-14 16:04:49 +02:00
Weblate
159927a742 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-05-14 12:00:47 +02:00
J.M
8473a5f789 add changelog entry for bug #3919 PropertiesIconic not honored 2013-05-14 12:01:07 +02:00
Randall Fan
04ee24ffd9 Translated using Weblate (Simplified Chinese) 
Currently translated at 99.7% (2600 of 2607)
 2013-05-14 12:00:43 +02:00
Spun Nakandala
22ba2d8147 Bug #3919 PropertiesIconic not honored fixed 
(cherry picked from commit 01c57f71ca)
 2013-05-14 11:51:29 +02: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
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