nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,161 Commits 1 Branch 0 Tags
20e460fc50adeaa3da3da28b54b2361c577f11c6
Commit Graph

38 Commits

Author SHA1 Message Date
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
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
c930d2bd4f patch #209978, missing svn:eol-style 2008-09-10 16:53:28 +00:00
Marc Delisle
e77938bb20 BLOBstreaming support (Google Summer of Code 2008, Raj Kissu Rajandran) -- work in progress 2008-08-20 17:04:37 +00:00
Marc Delisle
152a7342fd protection against cross-frame scripting 2008-07-24 17:12:32 +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
Sebastian Mendel
ff78811822 use $GLOBALS, cause this file is also included inside functions 2007-10-10 14:07:51 +00:00
Sebastian Mendel
98c8a7719e refactored JavaScript handling 2007-10-05 11:45:55 +00:00