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

164 Commits

Author SHA1 Message Date
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
b364cfd211 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-21 22:56:21 +02:00
Marc Delisle
6cb1bdc030 Merge branch 'QA_3_4' 2011-07-21 10:55:40 -04:00
Marc Delisle
36c0339eb0 Remove misleading comment on the "Rename database" interface 2011-07-21 10:55:10 -04:00
Piotr Przybylski
f36b2e5441 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php
 2011-07-21 16:21:16 +02:00
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 15:51:05 +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ř
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +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
3eaff6afb6 A few Drizzle-related changes to db operations tab 2011-06-26 18:38:36 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Piotr Przybylski
02b1b32b7b Fix formatting 2011-06-26 13:37:46 +02:00
Piotr Przybylski
7d99d57cca Merge remote-tracking branch 'origin/master' into drizzle 2011-06-25 01:00:00 +02:00
Piotr Przybylski
5403fc13ce PMA_MYSQL_INT_VERSION is at least 50001 (MySQL 5.0.1) 2011-06-25 00:50:50 +02:00
Piotr Przybylski
0a6f2823bd Use utf8-aware PMA_strtolower 2011-06-23 23:28:06 +02:00
Piotr Przybylski
97d5588d2b Allow to drop 'mysql' database in Drizzle 2011-05-25 19:49:22 +02:00
Piotr Przybylski
be748a7d84 Case insensitive comparisons to check for I_S, tread D_D as I_S 2011-05-17 00:00:21 +02:00
Marc Delisle
e6211f0c2f Other replacements for easier reading 2011-05-09 12:57:28 -04:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Madhura Jayaratne
f25945b8be DB Operations tab adjusted for low resolution browsers 2011-05-02 01:45:14 +05:30
Herman van Rink
0c39177753 add operations_full_width div to avoid overlapping boxes 
introduced in be14efaa75
 2011-04-25 13:54:00 +02: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
Michal Čihař
a0e72168ef Whitespace cleanup 2011-02-02 16:40:52 +01:00
Marc Delisle
728d5a1558 Conditional Ajax for DROP DATABASE 
Remove duplicate logic for confirmations
 2011-02-01 13:02:51 -05:00
Marc Delisle
3c573fc82e Conditional Ajax for other db operations 2011-01-29 10:32:56 -05:00
Marc Delisle
21fd381c84 Conditional Ajax on db rename 
Remove extra wrapping of jQuery object
Avoid extra generation of hidden field
Improve confirmation message on db rename
 2011-01-29 08:22:26 -05:00
Marc Delisle
871a474a97 Avoid notice for undefined global 2011-01-11 08:03:06 -05:00
Marc Delisle
5ea6683d0e Avoid notice for undefined global 2011-01-11 07:53:30 -05:00
Marc Delisle
54a37aee2d Tab characters should be 4 spaces 2011-01-11 07:48:12 -05:00
Dieter Adriaenssens
65fcab4122 Merge branch 'QA_3_3' 2010-11-14 21:08:28 +01:00
Dieter Adriaenssens
63aec5b328 bug #1762306, Copy database with view of a view 2010-11-14 21:03:13 +01:00
Dieter Adriaenssens
57c5abf579 Merge branch 'QA_3_3' 2010-11-14 18:28:10 +01:00
Dieter Adriaenssens
8277c92e25 bug #3077463, Events were not copied when copying/renaming database 2010-11-14 18:27:10 +01:00
Dieter Adriaenssens
1fe6e59d73 Merge branch 'QA_3_3' 2010-09-28 20:07:00 +02:00
Dieter Adriaenssens
c0d1c7a2ae export/copy procedures and routines before tables 2010-09-28 19:37:03 +02:00
Marc Delisle
ddc99a3dee renaming mysql db does not make sense 2010-09-26 07:39:37 -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
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
Michal Čihař
ada2a9e80f Better title for edit/export link. 2010-08-23 11:27:51 +02:00
Michal Čihař
f84659efcb Better file name for schema edit page. 2010-08-23 10:55:19 +02:00
Adnan
03d37b45f1 Removing previous schema generation code which was duplicating 2010-08-17 15:23:06 +05:00
ninadsp
6a3d0a7f58 Added documentation, fixed some minor bugs/typos 2010-08-13 23:34:10 +05:30
Adnan
bdf033115b Merge remote branch 'origin/master' into export_branch 2010-08-02 10:46:50 +05:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30