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

194 Commits

Author SHA1 Message Date
Marc Delisle
61731b8651 Merge branch 'QA_4_0' 2013-07-20 10:26:15 -04:00
Marc Delisle
6ac33adc15 ChangeLog entry for bug 4012 fix 
Fix another case of parameter incorrectly passed by reference
Adjust functions parameter doc
 2013-07-20 10:23:20 -04:00
Dmitriy Buldakov
cd421e018c Bug #4012 Crash on CSV file import 2013-07-20 10:18:02 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Kasun Chathuranga
63e0f33c4a PMA_DBI_affected_rows --> PMA_DBI_affectedRows 2013-05-04 08:41:55 +05:30
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Michal Čihař
1d5539d3aa Better function names 
Follow PEAR coding standard for function names.
 2013-05-02 15:01:11 +02:00
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Dieter Adriaenssens
ed94a77259 remove unused variables 2013-01-24 17:31:07 +01:00
Chanaka Indrajith
13208324d3 Removed unnecessary empty lines in functions 2012-09-19 00:15:15 +05:30
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Madhura Jayaratne
5fbb056280 Fix coding style. Remove trailing white spaces 2012-09-02 20:25:44 +05:30
Madhura Jayaratne
78c36808e5 Fix method names 2012-08-30 23:17:25 +05:30
Chanaka Indrajith
42bff42aca Support for swap among databases in multiple queries 2012-07-22 18:33:02 +05:30
Chanaka Indrajith
9f1f8d6c75 Support for stored procedures with multiple queries 2012-07-22 16:22:49 +05:30
Chanaka Indrajith
d5acfed0e8 Multiple results support for SQL executions 2012-07-20 23:13:04 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
ec046f7d11 Use camel case for function names (PMA_query_as_controluser => PMA_queryAsControlUser) 2012-06-23 23:06:29 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Madhura Jayaratne
5018efbe86 Space after exclamation mark to improve readability 2012-06-02 22:58:45 +05:30
Madhura Jayaratne
92c3f58fe4 Wrap some more long lines 2012-06-02 22:55:58 +05:30
Madhura Jayaratne
e0e21d8bfb Fix docs 2012-06-02 22:48:34 +05:30
Madhura Jayaratne
8ccb095307 Wrap some long lines 2012-06-02 22:45:03 +05:30
Madhura Jayaratne
9398f99503 Various coding style improvements 2012-06-02 22:41:39 +05:30
Marc Delisle
f2d19ef568 Fix merge conflicts 2012-05-05 06:59:51 -04:00
Yuichiro Takahashi
5088e86fd1 Fix popup message on build SQL of import 2012-05-05 18:21:55 +09:00
Rouslan
22bcd22a1f Removed duplicate funciton introduced in 4550b049c1 2012-04-30 19:35:35 +01:00
Jo Michael
1923e13ee7 Fix new checkstyle LineLength warnings 2012-04-29 02:56:42 +02:00
Jo Michael
2466594cb7 Fix checkstyle ControlStructures warnings 2012-04-29 02:07:56 +02:00
Dieter Adriaenssens
b14acc2e1c fix indentation 2012-04-28 22:44:03 +02:00
Michal Čihař
b846df7033 Empty line between @param and @return 2012-04-27 13:54:13 +02:00
Michal Čihař
397b6fd00e Cleanup spacing after @return 2012-04-27 11:33:26 +02:00
Michal Čihař
a5839a3813 Fix spacing before tags 2012-04-27 11:25:37 +02:00
Marc Delisle
28d45840ac Remove VerboseMultiSubmit configuration directive 2012-04-26 12:37:07 -04:00
Alex Marin
e13706fd3e fix replace statements for tables containing TABLE in their names 2012-04-16 12:34:53 +03:00
Madhura Jayaratne
4cb5bcd4b5 Improve coding style 2012-03-18 09:53:33 +05:30
Dieter Adriaenssens
e482a94305 improve coding style 2012-03-14 16:43:26 +01:00
Dieter Adriaenssens
2c11a32378 use better package tag 2012-03-14 16:43:26 +01:00
Alex Marin
4550b049c1 Patch #3495284 XML Import - fix message and redirect 2012-02-28 12:39:35 -05:00
Yuichiro
f324012ec1 patch #3473635 Join messages 2012-01-15 06:18:29 -05: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
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/database_interface.lib.php
 2011-08-24 21:40:52 +02:00
Piotr Przybylski
5ab5afd506 Use PMA_Table::isView() instead of PMA_isView() 2011-08-24 21:16:04 +02:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
 2011-08-17 16:39:43 +02:00
Madhura Jayaratne
46722b8035 Merge branch 'master' into OpenGIS 2011-08-17 16:43:18 +05:30
Dieter Adriaenssens
cbca775738 coding style and wrapping long lines 2011-08-17 00:09:17 +02:00
Madhura Jayaratne
7d7dd02e8c Merge branch 'master' into OpenGIS 
Conflicts:
	tbl_select.php
 2011-08-13 14:12:46 +05:30
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Dieter Adriaenssens
45aac8dbf4 coding style 2011-08-11 21:37:36 +02:00
Madhura Jayaratne
0e84927693 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/common.lib.php
 2011-08-08 07:45:53 +05:30
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
Michal Čihař
95b0af8892 Avoid composite messages 2011-08-05 10:47:03 +02:00
Michal Čihař
654228e091 Avoid composite messages 2011-08-05 10:43:31 +02:00
Michal Čihař
21b5b87c92 Escape only parts which need it, not translated string 2011-08-05 10:32:34 +02:00
Madhura Jayaratne
ec7feea9b0 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
	libraries/zip_extension.lib.php
 2011-07-24 23:05:35 +05:30
Piotr Przybylski
13f0d7a5d5 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-22 14:13:11 +02:00
Piotr Przybylski
2dee226c50 Add missing HTML escaping 2011-07-22 14:11:59 +02:00
Piotr Przybylski
a7fe9db581 Change strings 2011-07-22 14:09:57 +02:00
Piotr Przybylski
a04f592a92 Don't use DEFAULT CHARACTER SET when creating tables during import (Drizzle) 2011-07-22 13:39:23 +02:00
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ř
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Madhura Jayaratne
6f35aaa8e4 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 
Conflicts:
	libraries/import.lib.php
 2011-07-20 23:15:01 +05:30
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
4ee15be986 PMA_lookForUse - require whitespace after USE 2011-07-20 18:10:38 +02:00
Piotr Przybylski
6deed1fd2e Change NULL to null 2011-07-20 18:08:04 +02:00
Piotr Przybylski
b202936282 Unify function comments 2011-07-20 18:03:58 +02:00
Piotr Przybylski
3acae146b9 Use default engine for tables created during data import 2011-07-18 23:37:14 +02:00
Piotr Przybylski
738228a8d8 Import: don't use DEFAULT CHARACTER SET in db creation (Drizzle) 2011-07-18 23:35:32 +02:00
Madhura Jayaratne
ae88c2e758 Tabs replaced with spaces 2011-07-03 22:14:14 +05:30
Madhura Jayaratne
c4faafdc79 Import GIS data from ESRI shape files 2011-07-03 22:12:02 +05:30
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
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
Michal Čihař
bbbf2c49ed Drop $GLOBALS['charset']. 
It was anyway always set to utf-8 so it does not make sense to keep it
as a variable.
 2011-06-03 14:04:29 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Dieter Adriaenssens
fecfe761f9 drop Devel: prefix in links to wiki 2011-03-29 10:02:02 +02:00
Michal Čihař
186426cbaf Ignore NULL charset 2011-03-18 15:29:18 +01:00
Marc Delisle
f503d5667e Merge branch 'QA_3_3' 2010-09-29 08:04:47 -04:00
Marc Delisle
22fa5adee3 bug #3056023 [import] USE query not working 2010-09-29 08:04:32 -04:00
Dieter Adriaenssens
e539a03ef9 Merge branch 'QA_3_3' 2010-09-11 11:03:15 +02:00
Dieter Adriaenssens
f5879655d5 value can be negative 2010-09-11 11:02:14 +02:00
Dieter Adriaenssens
77b6fb172d Merge branch 'QA_3_3' 
Conflicts:

	ChangeLog
 2010-09-10 17:34:52 +02:00
Dieter Adriaenssens
194e357a99 BIGINT field type added to table analysis on import 2010-09-10 17:28:12 +02: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
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
e7b130baf7 Merge remote branch 'origin/master' 2010-07-19 21:54:37 +05:30
Dieter Adriaenssens
e31dcc11ef Merge branch 'QA_3_3' 
Conflicts:

	libraries/import.lib.php
 2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3 Converting number of Excel column names no longer limited 2010-07-14 22:29:26 +02:00
ninadsp
9dd93987ca Reverted po files changes. 2010-07-15 00:17:49 +05:30
Dieter Adriaenssens
17fc1370f3 Merge branch 'QA_3_3' 
Conflicts:

	ChangeLog
	libraries/import.lib.php
 2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9 Convert Excel column name correctly 2010-07-13 23:23:51 +02:00
Marc Delisle
c1be602a1e fix merge conflicts 2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894 bug #3026400 [PHP] ereg functions are deprecated 2010-07-08 07:49:11 -04:00
ninadsp
a8d6f9ff4c Merge remote branch 'origin/master' 2010-06-15 15:39:51 +05:30