gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,742 Commits 12 Branches 481 Tags 2.4 GiB
4ffeb06ca0
Commit Graph

149 Commits

Author SHA1 Message Date
Dieter Adriaenssens
8078441519 typo 2011-12-30 19:53:11 +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
Marc Delisle
9db5e4447c Fix merge conflicts 2011-10-19 13:21:42 -04:00
Marc Delisle
c76d9fea3a Merge branch 'QA_3_4' 2011-10-19 13:15:05 -04:00
Marc Delisle
ec99ab3e00 bug #3426031 [export] Export to bzip2 is not working 2011-10-19 13:11:22 -04:00
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Dieter Adriaenssens
5c751cd1c0 make die() messages translatable, where possible 2011-08-25 22:38:51 +02:00
Madhura Jayaratne
14c332461c Merge branch 'QA_3_4' 
Conflicts:
	export.php
 2011-08-24 22:50:37 +05:30
Madhura Jayaratne
786328c50b Sanitize filenames (in a unified manner) before using in Content-Disposition header 2011-08-24 22:44:38 +05:30
Marc Delisle
4d2521ac91 Merge branch 'QA_3_4' 2011-08-24 12:30:15 -04:00
Herman van Rink
c547703b10 Sanitize filenames before using in Content-Disposition header 2011-08-08 20:07:09 +02:00
Michal Čihař
5d05da19f2 Use new function for download headers 2011-08-04 14:19:07 +02:00
Michal Čihař
9405dbb82a Fix spacing after @param 2011-07-22 09:21:55 +02:00
Michal Čihař
84c6bd7284 Fix indentation 2011-07-22 09:06:37 +02:00
Michal Čihař
12a31298bd Spacing around if 2011-07-22 09:05:25 +02:00
Michal Čihař
297bd675cc Wrap long line 2011-07-22 09:02:04 +02:00
Michal Čihař
7b17fca511 Add die() calls are on places which should not happen 2011-07-22 09:01:40 +02:00
Michal Čihař
ea918f98ff Add file comment 2011-07-22 08:59:07 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Piotr Przybylski
f14a4e567f Unify comments for export plugins 2011-07-12 17:50:46 +02:00
Michal Čihař
8f54092c2d Remove forgotten references to $charset 2011-06-03 15:41:59 +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
Marc Delisle
1484ca6c00 Procedures and functions should be exported also when entering Export on a single db 2011-02-13 14:00:14 -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
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Crack
b8cee3086b Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	js/functions.js
	js/tooltip.js
	libraries/config.default.php
	libraries/config.values.php
	libraries/display_export.lib.php
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-08-19 14:45:18 +02:00
lorilee
948abf11d4 Added back button on the top of the page as well 2010-08-14 14:09:09 -07:00
lorilee
4b4374d8b3 Check if variable exists before calling 2010-08-11 13:27:08 -07:00
lorilee
030cad2cb6 Removed unneeded commented out code 2010-08-10 22:22:09 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
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ř
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
Michal Čihař
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +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
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
b24a566eba Export uses same expanding as title. 2010-07-21 09:36:28 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
 2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
fab6eb09ea Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-20 12:30:03 +02:00