Commit Graph

17 Commits

Author SHA1 Message Date
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
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
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
lorilee
d481a691cb Modified the Kanji encoding feature formatting to match the rest of the export/import forms 2010-06-19 11:49:48 -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
Michal Čihař
d47b913599 Adjust Kanji encoding feature to match look of the rest interface.
Move all options to single <fieldset>, now it looks at least consistent
with rest of the dialogs where it is being used.
2010-05-10 14:17:34 +02:00
Michal Čihař
ffcf1a8447 Add labels to Kanji encoding form. 2010-05-10 09:50:18 +02:00
Michal Čihař
eed76f7671 Reintroduce strings for Kanji conversion. 2010-05-10 09:36:36 +02:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +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
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Alexander M. Turek
37d50c1822 Huge set of optimizations, please test! 2003-11-26 22:52:25 +00:00
Garvin Hicking
f0da471ec3 /libraries cleanup hopefully done. Double-Checked every change, my installation still works. ;)
Will continue working on remaining files tomorrow and hope to make it to the end of the next day.
2003-11-20 16:31:51 +00:00
Michal Čihař
6884f9701a no more support for php3 2003-11-18 15:20:45 +00:00