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

108 Commits

Author SHA1 Message Date
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Michal Čihař
a5839a3813 Fix spacing before tags 2012-04-27 11:25:37 +02:00
Alex Marin
4de7d3c83d bookmark sql query after checking errors 2012-04-20 17:21:06 +03:00
Alex Marin
621280ec78 remove spaces around the not operator 2012-04-20 16:47:24 +03:00
Jo Michael
b2fd866d87 Leading ./ paths for includes can be omitted, part 2 2012-03-16 23:11:57 +01:00
Jo Michael
0326405d00 Don't rely on grab_globals for import.php 2012-03-16 20:14:27 +01:00
Marc Delisle
ed8a498bde $_POST and bookmark actions 2012-03-11 08:25:34 -04:00
Marc Delisle
1fa9416291 No longer depend on grab_globals.lib.php for $_GET variables 2012-03-04 06:59:57 -05:00
Marc Delisle
69e1b68c23 No longer globalize $_FILES 2012-02-26 07:21:43 -05:00
Marc Delisle
a7ea657625 Merge branch 'QA_3_4' 2011-11-05 10:33:45 -04:00
Gabor Gyorvari
8721f7b160 patch #3430291 [import] Handle conflicts in some open_basedir situations 2011-11-05 10:33:19 -04: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
13adb5adf7 Use lower case for true, false and null 2011-09-23 11:11:41 +05:30
Marc Delisle
369c9c550a Ajax and bookmark delete 2011-09-20 12:45:19 -04:00
Marc Delisle
516891a6b8 View only bookmark did not work with CodeMirror 2011-09-20 08:47:18 -04:00
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
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
Piotr Przybylski
f36b2e5441 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php
 2011-07-21 16:21:16 +02:00
Michal Čihař
06ba6d36c0 Remove tabs 2011-07-21 16:08:11 +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
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
Michal Čihař
103aed54d9 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-21 12:10:29 +02:00
Michal Čihař
dc6c1e8b5c I think htmlspecialchars should be used here 2011-06-21 12:08:48 +02:00
Piotr Przybylski
e8b144da11 File import - Drizzle has no SET NAMES so charset conversion without any PHP conversion library is impossible - throw an error 2011-06-10 21:09:50 +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ř
8f54092c2d Remove forgotten references to $charset 2011-06-03 15:41:59 +02:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
ac58a3d9f3 Merge branch 'QA_3_3' 2011-02-11 14:54:06 +01:00
Michal Čihař
7f975c8107 Force bookmark ID to be integer 2011-02-11 14:53:47 +01: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
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04: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
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02: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
9735acdda4 missing escape for quote 2010-05-14 13:38:48 -04:00
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery. 
patch #2986073
 2010-04-15 10:36:23 +02:00
Marc Delisle
7e77192187 rfe 2958013 After import, also list uploaded filename 2010-03-18 13:02:13 -04:00
Marc Delisle
0645a4f119 bug #2941101 import timeout when table already created and several data lines 2010-01-31 16:42:06 +00:00