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

153 Commits

Author SHA1 Message Date
Michal Čihař
a32fac4c4b Update references to SQL files 2012-02-14 16:01:32 +01:00
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
Madhura Jayaratne
0ad1a0f831 Fix doc blocks and multiline if statements 2011-09-27 21:49:41 +05:30
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
21e2913add Remove not needed param from PMA_REL_create_page 2011-08-15 11:37:23 +02:00
Michal Čihař
b0a108473e Remove not needed param from PMA_REL_create_page 2011-08-15 11:36:13 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
 2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
ca8a30f7f8 Fix usage of PMA_DBI_get_columns 2011-08-05 01:24:02 +02:00
Piotr Przybylski
11f2c43f11 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-03 23:58:48 +02:00
Madhura Jayaratne
c1f586b9fd Bug #3383904 - Column comments are not displayed 2011-08-03 20:48:28 +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ř
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
b40fdde6e8 Revert "Avoid double underscore in function name" 
This reverts commit c29c0e0eb5.

Oops, this is actually needed.
 2011-07-21 11:08:44 +02:00
Michal Čihař
c29c0e0eb5 Avoid double underscore in function name 2011-07-21 11:04:37 +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
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
12f70e8938 Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql() 
Fix PMA_DBI_get_columns() in Drizzle when $full == false
 2011-06-17 00:22:25 +02:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02: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
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
86d5ae2697 Emulate relations for some data_dictionary tables 2011-05-24 19:35:57 +02:00
Marc Delisle
8f2a040f41 Merge commit 'ab6d16ed2f4728c9f066353a851621a352ef969f' 2011-05-24 08:18:25 -04:00
Aris Feryanto
8f99ac7a28 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-24 08:42:32 +07:00
Piotr Przybylski
fe53e42d1d Remove deprecated function PMA_DBI_get_fields 2011-05-20 23:12:58 +02:00
Aris Feryanto
4ab5d6aded Update documentation and string for the pma_recent 2011-05-10 20:42:48 +07:00
Aris Feryanto
23021911b1 Recently used tables (class, configuration, remember in pma database) 2011-05-08 02:42:38 +07:00
Madhura Jayaratne
da82fe392b Bug #3183970 Losing SQL history 2011-02-18 18:54:36 +05:30
Marc Delisle
45eb47fe14 Merge branch 'QA_3_3' 2011-01-08 13:45:40 -05:00
Marc Delisle
8244589813 Bug #3153409 [core] 0 row(s) affected 2011-01-08 13:44:28 -05:00
Marc Delisle
ab393d3f82 Bug #3141327 (Foreign key input options) 2010-12-27 08:29:31 -05: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
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +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
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
Crack
d68f2db904 add warnings if pma_userconfig is not present 2010-06-18 20:22:34 +02:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Michal Čihař
f8d0e57a3d Can not use text as index here. 
We already get translated string.
 2010-05-25 16:56:29 +02:00