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

11073 Commits

Author SHA1 Message Date
Michal Čihař
f396eac331 Merge pull request #930 from WhaleWatching/imp_nav_ani 
Improve navigation .list_container animation
 2014-02-18 14:08:06 +01:00
Michal Čihař
bcc6ecde63 Use selectors based on form name rather than index 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-02-18 13:28:37 +01:00
Marc Delisle
c80e3beda2 Merge pull request #945 from WhaleWatching/nav_hover_show_full 
New feature, Navigation hover show full name
 2014-02-17 09:22:59 -05:00
Jeff Chan
896fe8169a Fix PMA_arrayWalkRecursive to ensure single pass thru keys 
Fix a bug with PMA_arrayWalkRecursive that causes it to apply a function
to its keys/values more than once. A previously incorrect test is fixed
as well.

The bug happens because when keys are modified, PHP's foreach loops
through the new keys again. This does not usually happen unless the
iterating array is passed through by reference (or has refcount=1).
See: http://stackoverflow.com/a/14854568/791890

Please see #936 for full explanation.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-17 03:09:34 +00:00
Marc Delisle
d20f0fee78 Merge branch 'QA_4_1' 2014-02-16 12:57:37 -05:00
Marc Delisle
06bd132d46 bug #4287 Printview - Always one column too much 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-16 12:57:01 -05:00
Marc Delisle
1029776df1 Merge commit 'ac80367' 2014-02-16 06:49:53 -05:00
Marc Delisle
8d3e6df816 Merge pull request #934 from sampathLiyanage/bugfix4286 
bug fix 4286
 2014-02-16 06:49:24 -05:00
Marc Delisle
d4c6964ffb Merge branch 'QA_4_1' 2014-02-15 09:35:38 -05:00
minhaz
abe8dbba82 Bug fix 4284 
Signed-Off-By: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-15 09:33:18 -05:00
Marc Delisle
2127ee0f3a Merge pull request #922 from jeffchan/remove-property-stable-sort 
Use stable sort for OptionsPropertyGroup removeProperty.
 2014-02-14 08:09:36 -05:00
Sampath Liyanage
ac80367c8c bug fix 4286 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-14 17:18:46 +05:30
Edward Cheng
d3e8fc3a2a Clear float after navigation <a> 
Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-13 23:51:59 +08:00
Marc Delisle
4f2816207a Merge commit '27f616e' 2014-02-12 08:15:54 -05:00
Jeff Chan
29ca1f7892 Use stable sort for removeProperty of OptionsPropertyGroup. 
The original custom sort function is not stable, which causes
different results on HHVM. It now uses the default array_diff
function which is stable. Also updated an incorrect test.

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-12 03:07:27 +00:00
Umair Khan
27f616e963 Contest-1 BugFix #4053 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-02-12 00:29:55 +05:30
Marc Delisle
3b76a7549a Merge commit 'b6cd8cd' 2014-02-11 12:31:28 -05:00
Marc Delisle
b7da0fa50c Merge pull request #913 from sampathLiyanage/bugfix4249 
bug fix 4249
 2014-02-11 12:28:25 -05:00
Edward Cheng
5fce4c83cb New feature, Navigation hover show full name 
Some database/table/column name just so long that can't show it completely,
relative to adjust the Navigation's width, hover to show it fully is better.

Btw, some end-sign notes "end" is uppercase, some is lowercase, i unify them to lowercase

Signed-off-by: Edward Cheng <c4150221@gmail.com>
 2014-02-11 18:50:08 +08:00
Marc Delisle
9a867d5148 Merge pull request #918 from jeffchan/format-byte-down-float 
Explicitly cast int to float in PMA_Util::formatByteDown()
 2014-02-10 18:53:15 -05:00
Jeff Chan
9a5603f908 Cast unit size value for formatByteDown to float to avoid overflow. 
Add another test case to formatByteDown which fails on HHVM 2.4

Signed-off-by: Jeff Chan <jefftchan@gmail.com>
 2014-02-10 18:25:54 +00:00
Marc Delisle
d0648cccf6 4.1.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:27:50 -05:00
Marc Delisle
4fc9aed582 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-09 07:13:36 -05:00
Marc Delisle
a3504f4185 Merge pull request #904 from Vasu014/bug4242 
Fix For Wildcard-containing only_db failure in sidebar
 2014-02-09 07:08:57 -05:00
Marc Delisle
f60b0c92d0 Merge branch 'QA_4_1' 2014-02-08 19:51:13 -05:00
minhaz
afa4c8897e bug fix 4271 
Signed-off-by: A V Minhaz <minhazav@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-08 19:47:11 -05:00
Sampath Liyanage
b6cd8cdb33 bug fix 4249 
Signed-off-by: Sampath Liyanage <plbsam@gmail.com>
 2014-02-08 22:24:03 +05:30
Vasu Bhardwaj
45b538b1ec Fix For Wildcard-containing only_db failure in sidebar 
This commit fixes the Bug #4242. The "only_db"directive  now accepts
MySQL LIKE wildcards without errors.Changes have been made to the
function getData() in phpmyadmin/libraries/navigation/Nodes/Node.class.php .
The if-else clause has been removed. The checking of the "only_db"
directive is now performed solely by the function
getWhereClause()in the same class.

Signed-off-by: Vasu Bhardwaj <voodoorapter014@gmail.com>
 2014-02-08 21:54:18 +05:30
Chanaka Indrajith
0cc71660b0 Rearange the order of export sql related user preferences 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-08 17:25:36 +05:30
Madhura Jayaratne
f65ac8803e Merge branch 'QA_4_1' 2014-02-08 13:06:10 +05:30
Madhura Jayaratne
59e3c9474a bug #4278 reCaptcha re-login requires double effort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 13:04:32 +05:30
Madhura Jayaratne
61338c4859 Remove trailing whitespaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-02-08 12:38:37 +05:30
Marc Delisle
0034680de8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-07 12:45:24 -05:00
Marc Delisle
e8f14e0ac0 Merge pull request #897 from dhananjay92/bug#4237 
Fix for bug#4237.
 2014-02-07 12:37:33 -05:00
Marc Delisle
cd998a4c62 Merge pull request #892 from Chanaka/rfe-1403 
rfe-1403 : Support for export only triggers/stored procedures
 2014-02-07 07:57:48 -05:00
Dhananjay
0a18d86059 Fix for bug#4237. 
Signed-off-by: Dhananjay <dhananjaynakrani@gmail.com>
 2014-02-07 11:56:46 +05:30
Chanaka Indrajith
4457f40ef4 Support for export server/db/table without views 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-06 23:03:04 +05:30
Marc Delisle
f48946f2ad Merge pull request #894 from vpowerrc/master 
fixed loosing of auto increment value when exporting sql
 2014-02-05 08:47:56 -05:00
Atul Pratap Singh
b2e85797d6 Merge commit '109eb9e' 2014-02-06 00:19:30 +05:30
Atul Pratap Singh
109eb9e1f2 Fix bug#4274 index_div was being added twice 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-02-06 00:04:29 +05:30
Viduranga Wijesooriya
4c1b38ddf2 fixed loosing of auto increment value when exporting sql 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-05 17:26:19 +05:30
Chanaka Indrajith
55151381fa rfe-1403 : Support for export only triggers/stored procedures 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-02-04 22:47:00 +05:30
Viduranga Wijesooriya
641fa53789 fixed #4261 Export bug 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
 2014-02-04 19:03:46 +05:30
Michal Čihař
923d3b4d8c Merge commit '8219b4cc9c5649e4b06f30130e5fe50c00dfc72b' 2014-02-04 08:11:40 +01:00
Marc Delisle
ae163e4d67 Merge commit '2453a15' 2014-02-03 12:30:23 -05:00
Marc Delisle
f5ba57c290 Revert "Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733" 
This reverts commit 36e544ce9e.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 10:11:44 -05:00
Marc Delisle
464616c26b Merge commit '36e544c' 2014-02-03 08:44:37 -05:00
Marc Delisle
36e544ce9e Avoid using hard-coded argument separator, see https://sourceforge.net/p/phpmyadmin/bugs/3733 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-03 08:42:39 -05:00
Dieter Adriaenssens
1c582e4cb9 improve users/user groups table description 2014-02-03 13:32:57 +01:00
Michal Čihař
6f076b34e5 Drop flashcanvas 
Let's drop flashcanvas, which we use for rendering charts with MSIE 8
and older. I've tested it a bit and in none of the uses it works
properly, so it really does not work as a drop in replacement for native
browser support and it would probably need some adjustment in our code.

Also it is problematic from licensing point of view as we do not ship
source for it js/canvg/flashcanvas.swf.

Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-02-03 13:32:01 +01:00