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

170 Commits

Author SHA1 Message Date
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Alex Marin
1ef56d1662 Merge branch 'master' into plugins-and-OOP 2012-06-18 14:26:13 +03:00
Alex Marin
0899d6722e oop: merge master 2012-06-17 11:40:11 +03:00
Chanaka Indrajith
71b01ec879 Modifications to PMA_externalBug() function in common.lib.php and renamed as PMA_getExternalBug() 2012-06-14 09:22:18 +05:30
Rouslan Placella
015fce08ee Fixed bad variable name 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Madhura Jayaratne
3332151859 Fix Checkstyle Warnings - Type: CloseBracketLine (Closing parenthesis of a multi-line function call must be on a line by itself) 2012-04-14 09:09:21 +05:30
Madhura Jayaratne
f354e74c34 Coding style improvements - mostly fixing doc comments 2012-03-17 19:31:25 +05:30
Marc Delisle
83b5e0d07a No longer depend on grab_globals.lib.php for $_GET variables 2012-03-06 06:37:29 -05:00
Marc Delisle
c555fc1b34 Fix merge conflicts 2011-12-14 08:00:51 -05:00
Dieter Adriaenssens
bd3735ba58 [security] Self-XSS on export options (export server/database/table), see PMASA-2011-20 2011-12-10 17:10:41 +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
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Marc Delisle
003d879a64 Merge branch 'QA_3_4' 2011-09-11 06:51:29 -04:00
Marc Delisle
03a75ab9e0 bug #3399951 [export] Config for export compression not used 2011-09-11 06:51:09 -04:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Madhura Jayaratne
5217946601 bug #3340151 [export] Working SQL query exports error page 2011-07-02 07:05:54 +05:30
Madhura Jayaratne
4d1540cc1c bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option 2011-07-01 22:58:35 +05:30
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Madhura Jayaratne
6619e39d63 Merge branch 'QA_3_4' 2011-05-22 13:06:05 +05:30
Madhura Jayaratne
16305005c5 bug #3305517 [config] Config for export compression not used 2011-05-22 13:00:39 +05:30
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Michal Čihař
04acac8235 More uses of standard function for PHP doc links 2011-02-17 10:50:59 +01:00
Michal Čihař
67e4994490 Single place to handle redirection. 2011-01-31 15:22:25 +01:00
Michal Čihař
dc0c6938b2 [security] Redirect external links to avoid Referer leakage. 2011-01-28 13:22:41 +01:00
Marc Delisle
a0ce9830fb Messages not under gettext 2011-01-07 07:50:48 -05:00
Marc Delisle
013f57b0ae English improvements 2010-12-07 09:46:36 -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
Michal Čihař
ac5cab4f6f These should be translatable as well. 2010-08-27 16:16:54 +02:00
Marc Delisle
c9d4d52fff correct template variable 2010-08-27 10:03:52 -04:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Crack
e344696016 account for changes introduced when merging lori/gsoc branch 2010-08-19 16:36:41 +02:00
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
Michal Čihař
763aff5a6f Use format strings. 2010-08-19 11:30:32 +02:00
lorilee
8fa03264e4 Added comments 2010-08-14 15:14:45 -07:00
lorilee
03fdce14c4 Checks if value is a string before calling urldecode() 2010-08-14 14:10:18 -07:00
lorilee
4482228f66 Back button on export.php page 2010-08-10 22:11:57 -07:00
lorilee
c41d4be0b1 This code got deleted somehow from a previous commit 2010-08-02 13:48:06 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
Marc Delisle
d0fc397fe1 new database format string 2010-07-28 13:05:24 -04:00
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00