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

90 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Marc Delisle
f1d8953670 fix conflicts 2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b bug #2986422 [import] Results for query are not displayed 2010-06-13 08:42:24 -04: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
Marc Delisle
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00