gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,801 Commits 12 Branches 481 Tags 2.4 GiB
6dbcab261e
Commit Graph

128 Commits

Author SHA1 Message Date
Piotr Przybylski
6dbcab261e Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_status.php
 2011-07-20 18:23:21 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
a0a4628b11 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/export/latex.php
	libraries/export/odt.php
	libraries/export/texytext.php
	libraries/export/xml.php
 2011-07-14 22:38:20 +02:00
Piotr Przybylski
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
1bf994d73f Try to cast default values for BOOLEAN columns to TRUE/FALSE 
Required for Drizzle, adds more correct values for MySQL
 2011-07-09 22:08:32 +02:00
Piotr Przybylski
024d4adc27 UUID has no length 2011-07-09 21:52:33 +02:00
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Piotr Przybylski
2c4c45a68d SERIAL and BOOLEAN columns have no length 2011-07-09 21:49:07 +02:00
Piotr Przybylski
b1b4e6389d Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_synchronize.lib.php
 2011-07-06 18:31:38 +02:00
Piotr Przybylski
7ef98dc9a2 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-30 00:52:01 +02:00
Aris Feryanto
24150ce3a9 Merge remote-tracking branch 'origin/master' into aris 2011-06-29 10:28:00 +08:00
Piotr Przybylski
eb8caa4b77 Removed dead and incorrect code 
(In static context $this makes no sense)
 2011-06-28 22:42:04 +02:00
Piotr Przybylski
2a8dee495a Fix/unify comments 2011-06-28 22:42:04 +02:00
Piotr Przybylski
02fef2c5af Proper check for TIMESTAMP 2011-06-28 22:42:03 +02:00
Aris Feryanto
60a0334661 Fix merge conflict with origin/master 2011-06-28 09:50:54 +08: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
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
28ae930a71 sql_mode doesn't exist in Drizzle 2011-06-26 21:25:24 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02: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
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Aris Feryanto
24a257ffce Column reordering: add checking for different server 2011-06-21 12:25:31 +07:00
Piotr Przybylski
2e01d01b32 Change all calls of SHOW KEYS/INDEX that use MySQL-specific fields to use query generation function 2011-06-18 00:15:43 +02:00
Piotr Przybylski
30b85be0a2 Allow for null values in PMA_DBI_get_tables_full 2011-06-17 21:03:02 +02:00
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_processlist.php
 2011-06-15 15:38:04 +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
0b933d2614 Fix more bug: Reordering not work correctly if table structure changed 2011-06-09 14:43:34 +07:00
Aris Feryanto
803b4639bd Fix bug: Remember sorting and Column reordering not work correctly if table structure changed 2011-06-09 13:04:41 +07:00
Aris Feryanto
e9c055c5bc Column reordering: remember the last column order 2011-06-07 18:22:22 +07:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Piotr Przybylski
7d3cd879a4 Enable exact row counts for views in I_S and D_D. They map to in-memory data, so this shouldn't pose a performance problem 2011-05-18 11:51:08 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -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
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
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
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Michal Čihař
5c2a111011 Fix format strings. 2010-05-05 11:44:55 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Michal Čihař
968f1f9d2d Merge branch 'QA_3_3' 2010-03-30 13:27:16 +02:00
Michal Čihař
a78fc12048 This method should be public. 2010-03-30 13:27:06 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
87dd6b3cee Merge branch 'QA_3_3' 2010-03-12 17:16:58 -05:00
Dieter Adriaenssens
7c818d046a patch #2969449 Name for MERGE engine varies depending on the MySQL version 2010-03-12 17:16:05 -05:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00