Commit Graph

371 Commits

Author SHA1 Message Date
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Michal Čihař
624d0db703 Better translatable title 2011-07-07 15:11:58 +02:00
Marc Delisle
3c0853dc68 Merge commit '61ea5e765db6c9382ef8fba9ab27737664b2d6cc' 2011-07-03 07:29:03 -04:00
Marc Delisle
12fcc270f2 Merge branch 'QA_3_4' 2011-07-02 20:52:10 -04:00
Aris Feryanto
c4ee218fb5 Navigation bar: more compact, display horizontal/vertical mode only when configured 2011-07-01 11:31:30 +08:00
Herman van Rink
b434320eff Fixed filtering of a file path, which allowed for directory traversal, see PMASA-2011-8 2011-06-30 20:26:08 +02:00
Aris Feryanto
f0c322cbdd Modify the navigation bar to provide more intuitive UI 2011-06-30 13:15:13 +08:00
Piotr Przybylski
00946276e7 Fix column ordering when query has LIMIT, PROCEDURE, FOR UPDATE or LOCK IN SHARE MODE and contains newline 2011-06-30 00:50:41 +02:00
Aris Feryanto
14ffb9ae84 Merge branch 'hidecol' into aris 2011-06-28 09:57:25 +08:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08:00
Aris Feryanto
c7892cf5bb Change to and some code fix 2011-06-28 09:42:26 +08:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Aris Feryanto
ba4515212a Remove 'too many' <th> when browsing table with vertical mode and repeat headers = small value 2011-06-27 12:10:04 +08:00
Aris Feryanto
4932550801 Show/hide column: remove hide button, add column visibility hint, and some prettification 2011-06-27 11:53:57 +08:00
Piotr Przybylski
3c55511e5c Use Create_time instead of CREATE_TIME 2011-06-26 18:28:35 +02:00
Aris Feryanto
66cb04ead5 Add new feature: show/hide column(s) while browsing a table 2011-06-24 18:18:43 +08:00
Marc Delisle
723e51dfdb Merge commit 'ede177c577668a712e0d89a8c895c1d0c200f42f' 2011-06-21 08:13:41 -04:00
Aris Feryanto
c5d1aae6f6 Column reordering: better placement of code for displaying remembered column order 2011-06-21 12:37:20 +07:00
Madhura Jayaratne
b261436a03 Merge remote branch 'remotes/madhura/master'
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
2011-06-21 07:33:40 +05:30
Marc Delisle
cf3930d29f Complete the code change for form renaming (rowsDeleteForm to resultsForm) 2011-06-20 16:25:11 -04:00
Thilanka Kaushalya
8604ba0303 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-18 22:38:44 +05:30
Thilanka Kaushalya
a8f258cb8d Added ajax dialog for table row change 2011-06-18 22:36:54 +05:30
Madhura Jayaratne
3c28961b9f Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
Conflicts:
	themes/original/css/theme_right.css.php
	themes/pmahomme/css/theme_right.css.php
2011-06-16 08:52:31 +05:30
Aris Feryanto
ff5e4c8361 Merge branch 'colresize' into aris 2011-06-15 07:23:32 +07:00
Aris Feryanto
d28d7daba1 Fix merge conflict with origin/master 2011-06-15 07:23:06 +07:00
Aris Feryanto
c1f6904eba Change PMA_isBrowsing to PMA_isSelect 2011-06-14 23:11:15 +07:00
Aris Feryanto
3750dcbb2f Column resizing & reordering: better support without javascript 2011-06-14 22:47:19 +07:00
Madhura Jayaratne
db06c5a912 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-14 18:52:52 +05:30
Madhura Jayaratne
9f4c4c91cf Labels for visualizations with OpenStreetMaps. New icon for the 'Visualize GIS data' link. 2011-06-14 18:49:32 +05:30
Aris Feryanto
84ad2a865c Fix PMA_isBrowsing criteria 2011-06-14 09:38:34 +07:00
Aris Feryanto
823decbaf4 Add 'Click to mark' hint 2011-06-14 09:37:51 +07:00
Michal Čihař
fedefef85c Properly handle case when there is no database selected 2011-06-13 14:49:45 +02:00
Aris Feryanto
4d27d21e80 No reorder column for table with only 1 column 2011-06-13 13:46:18 +07:00
Aris Feryanto
cf64d5282b Remember column order only in 'Browse' tab 2011-06-13 12:08:17 +07:00
Aris Feryanto
c89e0aa2ab Merge hint for column sorting 2011-06-13 11:21:09 +07:00
Madhura Jayaratne
28a9b971bf Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-12 20:14:31 +05:30
Aris Feryanto
fcc2f82fa5 Change column reordering text 2011-06-12 11:11:03 +07:00
Aris Feryanto
eb7c64dfad Merge remote-tracking branch 'origin/master' into colresize 2011-06-11 10:19:10 +07:00
Aris Feryanto
b81ae2e6cc Add column dragging hint & some css prettifier 2011-06-11 10:17:58 +07:00
Aris Feryanto
fcf671b382 Use __() for string in 'Restore column order' button, change javascript code style 2011-06-10 17:27:11 +07:00
Aris Feryanto
07c067a832 Fix for 'Restore column order' 2011-06-10 09:32:39 +07:00
Aris Feryanto
53d7bfa2b1 Change 'Restore table' button to 'Restore column order' 2011-06-10 08:05:37 +07:00
Aris Feryanto
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00
Marc Delisle
31bbba5e76 Merge branch 'QA_3_4' 2011-06-07 11:44:31 -04:00
Marc Delisle
2d56821c0f Improved fix for bug #3313210 2011-06-07 11:43:30 -04:00
Marc Delisle
b5e733a2e3 Merge branch 'QA_3_4' 2011-06-07 11:10:18 -04:00
Marc Delisle
82ac1e8028 bug #3313210 [interface] Columns class sometimes changed for nothing 2011-06-07 11:06:38 -04:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Aris Feryanto
3e3234b156 Fix bug: Header not displayed correctly when RowActionLinks = Nowhere, RepeatCells = some value that enough to display repeated header 2011-06-07 12:37:23 +07:00