gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,236 Commits 12 Branches 481 Tags 2.4 GiB
c806f1d64d
Commit Graph

107 Commits

Author SHA1 Message Date
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Madhura Jayaratne
e182f2370b Coding style fixes 2012-06-24 10:27:05 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Alex Marin
89570a5475 oop: import/upload interface and classes 2012-06-22 18:28:24 +03:00
Alex Marin
1ef56d1662 Merge branch 'master' into plugins-and-OOP 2012-06-18 14:26:13 +03:00
Alex Marin
0899d6722e oop: merge master 2012-06-17 11:40:11 +03:00
Chanaka Indrajith
4720a4884c Modifications to PMA_selectUploadFile() function in common.lib.php and renamed as PMA_getSelectUploadFileBlock() 2012-06-14 13:05:10 +05:30
Chanaka Indrajith
c512706677 Modifications to PMA_browseUploadFile() function in common.lib.php and renamed as PMA_getBrowseUploadFileBlock() 2012-06-14 09:45:26 +05:30
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
d817f6cccc Renamed PMA_reloadNavigation() to PMA_getReloadNavigationScript() 2012-06-11 14:06:02 +01:00
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Jo Michael
161a5a9321 Fix new checkstyle warnings 2012-04-29 03:16:11 +02:00
Jo Michael
7c1411d3e0 Fix checkstyle InlineControlStructure warnings 2012-04-29 02:36:12 +02:00
Madhura Jayaratne
4b8d52d937 Fix CheckStyle warnings, Type:CloseBracketNewLine (Closing parenthesis of a multi-line IF statement must be on a new line) 2012-04-22 21:28:41 +05:30
Jo Michael
13644d8591 Short-hand notation for jQuery document.ready event 2012-04-21 02:44:18 +02:00
Michal Čihař
40bf5062a1 Better translatable string 2012-04-10 11:58:41 +02:00
Jo Michael
6ba62e1b2d Replaced "seperator" with "separator" 2012-04-07 20:23:22 +02:00
Jo Michael
952ca9efca Show file upload speed for imports 2012-04-07 20:17:49 +02:00
Jo Michael
263d0137fd Show progress bar with timing for import uploads 2012-04-07 19:55:45 +02:00
Jo Michael
321b8cc880 Added width and height attributes to ajax throbber img. 2012-04-07 16:02:47 +02:00
Jo Michael
69ce80b4f8 Clean up opening import <form> tag 2012-04-07 15:43:36 +02:00
Jo Michael
5b09d0f066 Cleanup HTML5 validity issues 2012-04-01 20:14:50 +02: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
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Madhura Jayaratne
9bcb83af03 File is being conditionally included; use "include" instead 2011-09-23 10:56:30 +05:30
Marc Delisle
c968408de7 Merge branch 'QA_3_4' 2011-07-22 09:35:51 -04:00
Sven Strickroth
201ad07ea8 Do not add backquotes for normal displayed text 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2011-07-22 09:33:30 -04:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
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