nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,157 Commits 1 Branch 0 Tags
73c57b099e8b2d2c99fcb4d0888dcc40f4dd366a
Commit Graph

76 Commits

Author SHA1 Message Date
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Michal Čihař
a6baca6d77 Remove stray </div> 2011-01-28 10:52:04 +01: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
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Michal Čihař
d76fe3856b Remove some HTML from translatable strings. 2010-08-19 11:35:45 +02:00
Michal Čihař
763aff5a6f Use format strings. 2010-08-19 11:30:32 +02:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
lorilee
db9527b4c6 Merging with master 2010-07-20 15:30:36 -07:00
Michal Čihař
11e53fb141 [core] Dropped AllowAnywhereRecoding configuration variable. 
It really does not make sense these days, now the recoding of
export/import is available when the necessary extensions are loaded and
it is possible to disable it using RecodingEngine directive.
 2010-07-20 12:05:07 +02:00
lorilee
c05038e847 Added a title to the import page to show the current import mode (server/database/table) 2010-07-08 12:37:10 -07:00
lorilee
3c1e06a3e6 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-06 11:04:06 -07:00
lorilee
f06363811c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-06 10:58:17 -07:00
lorilee
2e3fad7456 Support for no javascript 2010-07-05 16:19:03 -07: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
f368184a12 fix typo; remove Id 2010-06-29 07:57:45 -04:00
Marc Delisle
90ac3d39a0 bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible 2010-06-29 07:56:10 -04:00
lorilee
66c6a30185 Changed input element ID names to make more sense 2010-06-24 16:55:55 -04:00
lorilee
0a456e8681 Updated file selection form 2010-06-22 21:07:43 -04:00
lorilee
02e896e423 Modified the Kanji encoding feature formatting to match the rest of the import form 2010-06-19 11:49:31 -04:00
lorilee
7227949dfb Fixed XHTML syntax problems 2010-06-18 16:15:16 -04:00
lorilee
135868db80 Updated the formatting for selecting a file to import 2010-06-15 23:38:28 -04:00
lorilee
a9ce5c1555 Modified label text, removed inline javascript, modified style of Go button, added import notification for plugins 2010-06-11 01:26:35 -04:00
lorilee
d36b1a7593 New import page; reorganized formatting 2010-06-11 01:26:35 -04:00
lorilee
8438098276 Modified label text, removed inline javascript, modified style of Go button, added import notification for plugins 2010-06-11 01:13:54 -04:00
lorilee
9c25fa4ebb New import page; reorganized formatting 2010-06-09 21:43:54 -04:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8 conform to relational terminology regarding columns and rows 2010-05-31 14:33:21 -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
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Marc Delisle
78bb9c71c0 bug #2998889 Import button does not work in Catalan 2010-05-09 07:07:15 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
46b2ed8ddd current bytes uploaded was displayed as undefined 2010-04-15 11:24:31 -04:00
Philip Frank
c77216d532 [interface] Convert upload progress bar to jQuery. 
patch #2986073
 2010-04-15 10:36:23 +02:00
sutharshan
9fda4bb515 Convert loading of export/import to jQuery ready event. 
This way it is done after document is fully loaded and no race
conditions can appear as with inline js.

patch #2984337, bug #2983446
 2010-04-11 11:17:47 +02:00
Michal Čihař
ab325e609a Whitespace cleanup. 2010-04-09 15:39:56 +02:00
Herman van Rink
2d60036978 uploadprogress: cleanup + added documentation link. Merged from git 2010-03-02 10:11:37 +00:00
Tomas Srnka
9e8618c4f9 Import progress bar fix from GIT 2010-03-02 09:28:56 +00:00
Marc Delisle
e8ce440fb7 bug #2929958 Cannot import (French interface) 2010-01-11 17:56:53 +00:00
Marc Delisle
e7d20c38bf XHTML improvements 2009-12-29 17:45:15 +00:00
Tomas Srnka
818a664b3d Updated JS code for displaying upload and import information 2009-09-13 12:28:35 +00:00
Marc Delisle
60536d78e1 patch #2798592 [import] Progress bar 2009-07-02 12:12:06 +00:00
Michal Čihař
7676f7e1b5 rfe #2100910 configurable default charset for import 2008-11-30 13:53:40 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Marc Delisle
6208585d04 no longer useful since all lang files are UTF-8 2008-10-01 20:48:40 +00:00
Marc Delisle
2fff6e358f bug #2080963 [charset] Clarify doc and improved code 2008-09-07 15:29:00 +00:00
Marc Delisle
9e83516255 bug #2033962 [import] Cannot import zip file 2008-08-09 17:14:28 +00:00
Marc Delisle
19a9c6017d bug #2018595 [import] Potential data loss on import resubmit 2008-07-17 14:02:26 +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
085a7c8f22 make use of PMA_Message 2007-10-17 12:14:19 +00:00