Commit Graph

58 Commits

Author SHA1 Message Date
Rouslan Placella
1807efb18f Removed pointless includes: If common.inc.php was not already included we would fail the !defined('PHPMYADMIN') check at the top of each file. 2012-05-08 19:53:52 +01:00
Madhura Jayaratne
ec9a8cf997 Coding style improvements 2012-05-01 19:38:04 +05:30
Rouslan Placella
49a7f12e4e Include CodeMirror globally 2012-04-25 23:47:24 +01:00
Gemorroj
6e8bc0dd74 Fixed title with table name is "test<>'"&test&&]]>", fixed chart with column name and data is "test<>'"&test&&]]>", some improvements. 2012-04-08 10:41:24 +03:00
Jo Michael
00b897ba34 Allow js_includes wrapped in IE-conditional comments 2012-04-01 19:15:02 +02:00
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +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
1431d02c8f Made PMA aware of the presence of sprites + added a script for generating sprites from icons 2011-09-26 20:46:28 +01:00
Marc Delisle
480e77e77e Merge branch 'QA_3_4' 2011-09-24 06:18:00 -04:00
Marc Delisle
158ce0657a Undefined variables when no server has been selected and no default server is defined 2011-09-24 06:17:34 -04:00
Madhura Jayaratne
e67a0a2531 Spaces between parameters in function calls 2011-09-23 08:43:41 +05:30
Tyron Madlener
82a1f9c033 addded PMA_AddJSCode() to load js code into the page header 2011-08-09 10:35:53 +03:00
Tyron Madlener
9ee8ff38c3 Replaced qtTip js library with non-minified version. 2011-07-22 11:41:13 +03:00
Michal Čihař
fc387fe531 Load codemirror only when needed
This needs verification with ajax requests.
2011-07-20 15:12:30 +02:00
Michal Čihař
53431974b1 Remove obsolete comment 2011-06-02 16:08:25 +02:00
Michal Čihař
a6b4e3a4b9 Use MySQL mode instead of plsql 2011-06-02 14:37:31 +02:00
Michal Čihař
28f97eb3c1 Hook CodeMirror to SQL editor 2011-06-02 14:24:16 +02:00
Marc Delisle
99eb0cde32 bug #3308072 [auth] Version disclosure to anonymous visitors 2011-05-30 16:32:29 -04:00
Michal Čihař
fca6631236 Replace manual <script> tag with common code. 2011-02-08 09:27:40 +01:00
Michal Čihař
1208ed935f Factor out code for generating JS inclusion. 2011-02-08 09:27:40 +01:00
Marc Delisle
9187f5abe2 jquery components should be under js/jquery 2010-09-13 13:03:45 -04: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
8b199f7e3a Replacing old tooltip with new jQuery plugin 2010-08-05 18:23:52 -07:00
lorilee
422e509078 Replacing old tooltip with new jQuery plugin 2010-08-05 17:31:02 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
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
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
40aaa768dd Factor out variable expanding. 2010-07-21 09:30:31 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
60285cd665 add missing string escapes
don't create <a> tag if LeftLogoLink is empty
2010-07-14 17:07:19 +02:00
ninadsp
e049c1d158 Merge remote branch 'origin/master'
Conflicts:
	po/fr.po
	po/sl.po
2010-07-03 21:00:08 +05:30
Marc Delisle
01d6fed4e2 fix merge conflicts 2010-06-30 11:37:53 -04:00
Marc Delisle
108f3305e9 bug: avoid loading twice a js file 2010-06-30 11:35:46 -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
f3f41cbe78 remove one instance of inline js 2010-04-17 13:51:08 -04:00
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery.
patch #2986073
2010-04-15 10:36:23 +02:00
Michal Čihař
12482d58eb Separate logic for loading messages to javascript.
This way they can be cached in browser and not loaded on each request.
2010-04-01 15:02:23 +02:00
Michal Čihař
58559fad07 Translate messages. 2010-04-01 14:29:35 +02:00
Marc Delisle
bd0c89b630 explain the timestamp we generate at load time for each .js file 2010-03-29 17:46:55 -04:00
Michal Čihař
df1671d1c4 Include mootools as first script. 2010-01-25 11:50:14 +00:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
67ae2130e7 rfe #1721189 [core] Force reload js on code change. 2010-01-21 13:37:08 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
e7d20c38bf XHTML improvements 2009-12-29 17:45:15 +00:00
Marc Delisle
9d8685d105 hardcoded messages 2009-11-24 15:31:57 +00:00