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

101 Commits

Author SHA1 Message Date
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Piotr Przybylski
4a5cb00df5 Fix jQuery UI version number 
It's 1.8.16, not 1.8.6
 2011-10-11 02:00:45 +02:00
Piotr Przybylski
ac365e0262 Upgrade jQuery UI to 1.8.6 2011-10-10 22:35:36 +02:00
Madhura Jayaratne
4cef030dd4 Merge branch 'QA_3_4' 2011-10-10 22:58:33 +05:30
Madhura Jayaratne
2d1b7bff0c Proper layout for table maintenance page 2011-10-10 22:57:45 +05:30
Madhura Jayaratne
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
ac088aaee0 use include() instead of require() when including file conditionally 2011-09-23 00:46:58 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Thilanka Kaushalya
90c010f9ca Fixed the issue of not showing the Docuemnts 2011-08-13 07:00:50 +05:30
Thilanka Kaushalya
3fdf5dd2ea Changed the logic of truncate table in table operations 2011-08-08 09:24:38 +05:30
Thilanka Kaushalya
e0d4dd51e6 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-08-07 16:22:03 +05:30
Thilanka Kaushalya
48a95cb479 Ajaxify table maintenance in table operations 2011-08-07 16:19:14 +05:30
Piotr Przybylski
66665f326a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_qbe.php
	js/server_status.js
	libraries/export/xml.php
	libraries/schema/Pdf_Relation_Schema.class.php
	tbl_printview.php
	tbl_structure.php
 2011-08-04 20:19:43 +02:00
Michal Čihař
183c0f437b Use PMA_DBI_get_columns 2011-08-04 16:24:09 +02:00
Piotr Przybylski
ce7e6feaf5 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/htmlword.php
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/sql.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-08-03 00:25:43 +02:00
Thilanka Kaushalya
66fbb2da26 Fixed the bugs in table copy of table operations 2011-07-31 22:53:02 +05:30
Thilanka Kaushalya
2784695154 Ajaxify the table coppy option in table operations 2011-07-31 12:20:17 +05:30
Piotr Przybylski
0eca09ffff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/dbi/mysqli.dbi.lib.php
 2011-07-27 20:10:38 +02:00
Thilanka Kaushalya
1635c5c0bc Ajaxify the Alter table order in Table operations 2011-07-25 22:22:13 +05:30
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
 2011-07-22 11:07:04 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
 2011-07-21 15:25:52 +02:00
Michal Čihař
97daa89610 Remove double spaces around else 2011-07-21 11:32:52 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Piotr Przybylski
c2b06f0a11 Don't use OPTIMIZE TABLE and REPAIR TABLE with Drizzle 2011-06-19 21:10:42 +02:00
Marc Delisle
884ba99afc Including non-existent file 2011-05-16 08:12:43 -04:00
Michal Čihař
d8ae01cdcf Merge branch 'integration' 
Conflicts:
	js/tbl_operations.js
 2011-05-11 13:40:39 +02:00
Benoit Dumesnil
b37d10c3f1 Feature Request #3187076 
This patch transforms the old-style pop-up of truncate and drop table
to a ajax style pop-up
 2011-05-11 13:38:41 +02:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Madhura Jayaratne
be14efaa75 Database operations tab made more compact. Table operations altered to use classes for styling. 2011-04-24 18:05:18 +05:30
Atul Pratap Singh
6acf4acd25 auto get back to the Table Operations tab 2011-03-28 14:22:36 +02:00
Marc Delisle
7cbdcd6be1 fix merge conflicts 2010-10-09 06:37:30 -04:00
Marc Delisle
2d4b9e2aea support ARIA storage engine as well as its previous name MARIA 2010-10-09 06:35:06 -04:00
Marc Delisle
98a5ba7317 misleading variable name 2010-09-04 07:01:30 -04:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Marc Delisle
2816b870c3 new labels for table operations; fix CSS 2010-07-28 05:44:03 -04:00
Michal Čihař
659bd9c838 Add trop/empty links to table operations tab. 2010-07-27 09:39:23 +02:00
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
Michal Čihař
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Michal Čihař
ad71c5b0ce Standard look to forms on table operations page. 2010-05-31 14:18:37 +02:00