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 |
|