75 Commits

Author SHA1 Message Date
Madhura Jayaratne
11ad4fd992 bug #3313235 [interface] Error div misplaced 2011-07-29 06:38:07 +05:30
Marc Delisle
aa0d3cfc4a Improve display of debugging queries 2011-02-20 07:04:08 -05:00
Michal Čihař
701268fb57 No javascript footer in AJAX requests. 2011-01-28 10:29:47 +01:00
Michal Čihař
b2fa59876b Avoid showing open in new window for AJAX requests. 2011-01-28 10:24:34 +01:00
Michal Čihař
7f1b1df69f [core] Remove last remaining parts of profiling code which was removed in 2006. 2010-08-30 11:01:31 +02:00
Michal Čihař
bf8a597d78 Remove dead code. 2010-08-30 10:54:17 +02:00
Michal Čihař
0c7e5b3f75 [bug #3055899] No footer file in ajax request. 2010-08-30 10:47:26 +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
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
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
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ř
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
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
Michal Čihař
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
7b46075360 Fixed bug where non-footnote notices were being hidden; footnotes given their own div classes 2010-07-16 00:09:58 -07:00
Crack
7a5fd62810 allow users to easily work with preferences stored in session (when pmadb is disabled): after logging in, user is presented with a message asking whether settings from localStorage should be loaded 2010-07-14 21:28:24 +02:00
ninadsp
5ab3a60612 Header and Footr output is suppressed if it is an Ajax request 2010-05-26 11:38:58 +05:30
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
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Michal Čihař
7393ad7bea jQuery -> $ 2010-04-12 11:31:42 +02:00
Michal Čihař
0805f5701e Do all javascript updating after loading document. 2010-04-02 13:00:45 +02:00
Michal Čihař
7b754395e9 Provide way for vendors to easily change paths to config files. 2010-03-31 12:29:21 +02:00
Michal Čihař
ecc4913a8c Reenable bookmarking code.
Just disable it for webkit based browsers, because they do not allow to
update any part of location without reload.

bug#2937481
2010-01-25 11:50:48 +00:00
Michal Čihař
94007b6705 Disable hash loading code for now.
I'll try to fix this properly, but probably not earlier than on Monday.
2010-01-22 21:48:04 +00:00
Michal Čihař
ddbffcd5bd [interface] It is now possible to bookmark most pages in JS capable browser. 2010-01-22 19:15:47 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
62461e5477 port 2.11.7.1 fix 2008-07-15 19:03:11 +00:00
Marc Delisle
544831fda7 patch #2007196, Typos in comments, thanks to knittl - knittl 2008-07-01 19:21:28 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
050406d7f6 view row counting: better logic and message 2008-05-10 13:27:38 +00:00
Sebastian Mendel
6207216296 differ between PHP and SQL debugging 2008-01-22 08:19:52 +00:00
Sebastian Mendel
2af8ede13d add summarizes to debug output 2007-12-13 10:29:43 +00:00
Sebastian Mendel
d462d869ad with $GLOBALS['cfg']['DBG']['enable'] = true display executed queries and there times in the main footer 2007-12-13 09:20:41 +00:00
Sebastian Mendel
d9eebc2ae0 removed closing of db connection, closing database connection is only required if script runs longer than database connection is needed 2007-10-16 14:02:16 +00:00
Sebastian Mendel
e623dc42cf new error handler - needs some more work, but works already:
- errors are gathered through all pages till displayed
 - errors are displayed in main footer
 - configurable error gathering
 - configurable error displaying
 - configurable error logging
2007-10-08 14:58:18 +00:00
Sebastian Mendel
4355a564d5 refactored tooltip handling (please test!) 2007-10-05 13:18:04 +00:00
Marc Delisle
c3fa7c14f6 bug #1791568 Undefined cfg, thanks to Christian Schmidt 2007-09-11 21:04:32 +00:00
Marc Delisle
f73d68265b RFE #1743983: replace $max_characters by a configurable param MaxCharactersInDisplayedSQL 2007-07-01 19:26:41 +00:00
Marc Delisle
9d9cd7221b bug #1727138 HTML not encoded (last part of the fix) 2007-06-27 15:12:40 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Sebastian Mendel
b2f3ae5fcf make $sql_query persistent (init it, never unset it, always assume it is set) 2007-04-01 09:26:14 +00:00
Sebastian Mendel
008734f8b0 do NEVER unset $table or $db;
no need to test for isset() on $db and $table;
always test with strlen() for valid $table or $db;
2007-03-30 09:12:05 +00:00
Sebastian Mendel
3626acdb24 improved out buffer function handling;
bug #1690064 headers already sent error if OBGzip = 0
2007-03-29 07:10:15 +00:00
Sebastian Mendel
8636d6398b documentation;
reflect changes in sql history code;
variable checking and escaping;
2007-03-22 16:41:46 +00:00