nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,275 Commits 1 Branch 0 Tags
6e79cb15a5fa25057d8501c51c89a2d2d88ec2b5
Commit Graph

651 Commits

Author SHA1 Message Date
lorilee
428053bef5 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-26 13:44:30 -07:00
lorilee
2a59451ac5 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	server_export.php
 2010-07-26 13:42:42 -07:00
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Michal Čihař
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
Michal Čihař
bcc372b5c5 Merge branch 'QA_3_3' 2010-07-26 15:51:48 +02:00
Michal Čihař
049fc7fef7 bug #3031705 [core] Fix generating condition for real numbers by comparing them to string. 2010-07-26 15:51:26 +02:00
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
lorilee
89b0a3082e Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-23 21:06:46 -07:00
lorilee
723a71c014 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/export/latex.php
	themes/darkblue_orange/css/theme_right.css.php
	themes/original/css/theme_right.css.php
 2010-07-23 20:43:35 -07:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
56ebe05af7 blob streaming code cleanup (work in progress) 2010-07-22 13:15:27 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Marc Delisle
8e98c5dd03 bug #3030862 (master only) inline sql edit got undefined 2010-07-22 08:47:47 -04:00
Michal Čihař
06cf763358 [interface] Better formatting for SQL validator results. 2010-07-21 13:45:32 +02:00
Michal Čihař
f5aa40b02f Catch error when connection to validator service fails. 2010-07-21 13:32:26 +02:00
Michal Čihař
e5e340e525 Proper propagating of overrided values. 2010-07-21 10:16:30 +02:00
Michal Čihař
7a788a52b9 Document why __VAR__ is there. 2010-07-21 10:07:03 +02:00
Michal Čihař
2040be9611 Documentation. 2010-07-21 09:56:05 +02:00
Michal Čihař
9b2aa3c40d Indentation. 2010-07-21 09:55:13 +02:00
Michal Čihař
7415caa4e4 LaTeX export uses PMA_expandUserString. 2010-07-21 09:51:24 +02:00
Michal Čihař
32910a9b28 Cleanup in PMA_expandUserString. 2010-07-21 09:43:38 +02:00
Michal Čihař
b24a566eba Export uses same expanding as title. 2010-07-21 09:36:28 +02:00
Michal Čihař
40aaa768dd Factor out variable expanding. 2010-07-21 09:30:31 +02:00
Michal Čihař
ce9e7a9462 Not used anywhere. 2010-07-21 09:26:00 +02:00
lorilee
aa49b85fad Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-20 15:23:12 -07:00
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ř
3e57a8eca9 No @uses __('Something'). 2010-07-20 15:06:34 +02:00
Michal Čihař
59428bb433 Whitespace cleanup. 2010-07-20 14:36:44 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
85e2225ac7 Fixed the issue in PMA_showMessage() where ['cell_align_left'] is not set in an Ajax request. Put an isset() conditional in place 2010-07-16 20:14:25 +05:30
lorilee
5ad3a70718 Improved tooltip for JavaScript-enabled browsers (superscripts changed to icons) 2010-07-13 17:44:05 -07:00
ninadsp
6aa7315682 The PMA_mysqlDie() now supports Ajax requests. It now shows a JSON 
response in an Ajax request.
Modified the PMA_ajaxResponse() function to handle messages which are
not instances of the PMA_Message class.  Requited for PMA_mysqlDie()
 2010-07-14 00:53:19 +05:30
lorilee
8b6e179bd9 Changed the Import form's 'Browse the server' label to 'Browse your computer' 2010-07-08 13:50:46 -07:00
ninadsp
47142291a1 Merge remote branch 'origin/master' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
 2010-07-07 18:31:09 +05:30
ninadsp
6e9e3836e5 We don't need to buffer the output in PMA_showMessage() when making an SQL query. Added a global variable which is set in sql.php during an ajax request. 2010-07-03 02:51:02 +05:30
ninadsp
466d3f7ae5 Discarded the unused PMA_ajaxOutputBuffelHandler() function. 2010-06-30 21:00:45 +05:30
ninadsp
9a4b524db7 Hacked the PMA_generate_slider_effect() code to work with jQuery. Ajax 
queries were failing due to the use of document.write(). Need to find a
better solution with $.append()
 2010-06-28 01:59:52 +05:30
ninadsp
a3dd431bdb Modified PMA_showMessage so that it can show the sql query even in an 
ajax request, by using output buffering.
Added a function to handle the output buffer for the ajax request.
Fixed a typo in PMA_ajaxResponse
 2010-06-27 23:03:20 +05:30
lorilee
66c6a30185 Changed input element ID names to make more sense 2010-06-24 16:55:55 -04:00
lorilee
6913ce2a42 Removed inline CSS 2010-06-22 20:38:52 -04:00
ninadsp
cf15d940cd Bug noticed by Marc Delisle in PMA_ajaxResponse fixed 2010-06-22 11:41:55 +05:30
lorilee
5d751f1fe2 Fixed XHTML syntax problems 2010-06-18 16:34:10 -04:00
lorilee
9fd0613a51 Revert "Fixed XHTML syntax problemsloris-computer:/Library/WebServer/Documents/gsoc Lori$ git commit libraries/common.lib.php" 
This reverts commit 92779ae9c0.
 2010-06-18 16:23:33 -04:00
lorilee
92779ae9c0 Fixed XHTML syntax problemsloris-computer:/Library/WebServer/Documents/gsoc Lori$ git commit libraries/common.lib.php 
Fixed XHTML syntax problems
 2010-06-18 16:14:09 -04:00
Martynas Mickevicius
d1708970d6 moved chart dependant code to the chart lib. 2010-06-17 17:10:19 +03:00
ninadsp
266447bcd9 Added a function to echo a json output for an ajax request. 2010-06-17 00:16:13 +05:30
lorilee
9dbe9f4115 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-06-15 23:45:44 -04:00
lorilee
a2dfd7170a Added functions used to display file select forms in import 2010-06-15 23:36:20 -04:00
Martynas Mickevicius
d814efcfb6 added the chart in the profiling window 2010-06-15 20:13:34 +03:00
ninadsp
a8d6f9ff4c Merge remote branch 'origin/master' 2010-06-15 15:39:51 +05:30