gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,905 Commits 12 Branches 481 Tags 2.4 GiB
a01662dd4a
Commit Graph

356 Commits

Author SHA1 Message Date
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
3c55511e5c Use Create_time instead of CREATE_TIME 2011-06-26 18:28:35 +02: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
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Aris Feryanto
86d787267d Fix column resizing and reordering compatibility with custom actions column position 2011-06-06 14:51:22 +07:00
Madhura Jayaratne
7fca97fdde Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-04 01:30:20 +05:30
Madhura Jayaratne
75091e52fd Merge branch 'QA_3_4' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
 2011-06-04 00:36:51 +05:30
Madhura Jayaratne
612f8f3d67 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. 2011-06-04 00:02:11 +05:30
Madhura Jayaratne
17c222f83e 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-03 15:59:08 +05:30
Michal Čihař
d5f18d4e7f Merge branch 'integration' 
Conflicts:
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
 2011-06-02 11:41:31 +02:00
Rouslan Placella
860250f020 Fix bug #3302961 - Row check boxes missing when table row links are disabled 2011-06-02 11:39:57 +02:00
Madhura Jayaratne
deb6293b0a Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-31 15:21:38 +05:30
Michal Čihař
7410b8eee5 Can not use HTML entities here, is sometimes escaped 2011-05-31 10:27:48 +02:00
Madhura Jayaratne
c76da35c99 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-31 00:57:56 +05:30
Marc Delisle
ecc81cc238 bug #3308476 [interface] "Show all" not persistent after a sort 2011-05-27 16:04:53 -04:00
Marc Delisle
72bc4b6543 bug #3308476 [interface] "Show all" not persistent after a sort 2011-05-27 16:00:40 -04:00
Madhura Jayaratne
336b5358ab Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-05-25 00:51:31 +05:30
Michal Čihař
755fc28b49 Add space between size and unit 2011-05-24 13:08:10 +02:00