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

892 Commits

Author SHA1 Message Date
Piotr Przybylski
35843439df Provide proper function list in Insert dropdowns and proper column types in field type dropdowns (Drizzle) 2011-07-03 01:47:03 +02:00
Rouslan Placella
c150eb0c7c Integrate PMA_toggleButton() with $cfg['AjaxEnable'] 2011-06-30 13:19:31 +01:00
Rouslan Placella
b4b56ed461 Merge branch 'master' into rte 
Conflicts:
	db_routines.php
	libraries/db_events.inc.php
	libraries/rte/rte_routines.lib.php
 2011-06-30 11:42:16 +01:00
Madhura Jayaratne
b8ddd56d78 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS 2011-06-30 10:01:33 +05:30
Rouslan Placella
cbafdb9a1f Refactored some routine, trigger and event manipulation code 2011-06-28 17:11:53 +01:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Piotr Przybylski
d4d647e169 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-26 18:32:20 +02:00
Marc Delisle
7322e858f0 Incorrect comment for return param 2011-06-26 09:05:19 -04:00
Madhura Jayaratne
63900d0094 GIS data editor for environments without JavaScript support. 
GIS data preserved while editing.
 2011-06-25 19:39:31 +05:30
Piotr Przybylski
e38b5cd4ff Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	db_structure.php
	libraries/common.lib.php
	libraries/database_interface.lib.php
	tbl_structure.php
 2011-06-23 14:02:58 +02:00
Rouslan Placella
223832b68d E_ALL fix in PMA_currentUserHasPrivilege() 2011-06-20 11:33:06 +01:00
Rouslan Placella
db6ae660cf Removed duplicate function PMA_getSupportedCharsets() that was added by mistake into the routines functionality. 2011-06-20 10:44:37 +01:00
Piotr Przybylski
a7ba0fd74a Extract server type detection from main.php and make it available in common.lib.php 2011-06-19 23:15:54 +02:00
Piotr Przybylski
c2b06f0a11 Don't use OPTIMIZE TABLE and REPAIR TABLE with Drizzle 2011-06-19 21:10:42 +02:00
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	server_processlist.php
 2011-06-15 15:38:04 +02:00
Rouslan Placella
4047020d78 Refactored code that generated the dropdown list of MySQL functions. 2011-06-15 12:45:50 +01:00
Aris Feryanto
b3faf9cf42 Merge branch 'tablesort' into aris 2011-06-15 07:23:37 +07:00
Aris Feryanto
5bf8536831 Fix bug in 'Remember Sorting': modified caused error in PHP 2011-06-15 07:10:16 +07:00
Rouslan Placella
dda7ce9c39 Merge branch 'master' into rte 2011-06-14 19:44:09 +01:00
Rouslan Placella
041d5bd9d4 Moved PMA_getSupportedCharsets() to common.lib.php 2011-06-14 14:05:37 +01:00
Rouslan Placella
c220bb4e13 Moved PMA_getSupportedDatatypes() to common.lib.php 2011-06-14 13:56:00 +01:00
Tyron Madlener
e6874ce0c7 Clearer comment on PMA_formatNumber() 2011-06-13 18:53:45 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Tyron Madlener
f4a2a92ea2 Fixed PMA_formatNumber() sometimes choosing too high SI preifx 2011-06-10 19:26:03 +02:00
Rouslan Placella
aa2692c12f Fixed call to undefined function. 2011-06-10 15:36:44 +01:00
Rouslan Placella
a07a1d997c Merge branch 'master' into rte 2011-06-09 21:26:26 +01:00
Piotr Przybylski
90099b7b5d Remove PMA_STR_binarySearchInArr in favor of isset and in_array 2011-06-08 19:23:58 +02:00
Tyron Madlener
9410a4cfd9 Forgot 2 lines in PMA_formatNumber() 2011-06-08 10:31:22 +02:00
Tyron Madlener
0d1872595f Math to the resuce! Nicer calculation of PMA_formatNumber() without any loops 2011-06-08 10:19:59 +02:00
Tyron Madlener
902fc1d95d - Replaced pChart profiling chart with highchart chart 
- Moved PMA_profilingResults() function code inline in sql.php as its used at only one place
 2011-06-07 21:32:05 +02:00
Tyron Madlener
e913dcc6e1 -Tabs +Spaces 2011-06-07 20:58:56 +02:00
Tyron Madlener
86323a7815 Better PMA_formatNumber() behaviour. 2011-06-07 20:50:38 +02:00
Rouslan Placella
6752d54b84 Support "MySQL functions" in the Execute Routine functionality. 2011-06-07 14:15:41 +01:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Piotr Przybylski
610614c95f Removed global variables with array counts in sqlparser.lib.php 2011-06-06 00:25:52 +02:00
Piotr Przybylski
52df66878c Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/server_links.inc.php
 2011-06-02 01:07:00 +02:00
Rouslan Placella
3b15014760 Removed duplicate function introduced earlier by mistake. 2011-06-01 17:32:24 +01:00
Rouslan Placella
15bc505431 Escape the database and table names in PMA_currentUserHasPrivilege() 2011-06-01 14:49:27 +01:00
Rouslan Placella
bfb1102da4 Disabled access to Routines features if the user does not have the required privileges. 2011-06-01 12:52:38 +01:00
Rouslan Placella
c6254910b2 Intoduced PMA_currentUserHasPrivilege() to easily disable access to some features. 2011-06-01 12:47:35 +01:00
Rouslan Placella
409dcfcde5 Merge remote-tracking branch 'origin/master' into rte 2011-05-31 19:22:38 +01:00
Tyron Madlener
d50e5120d9 Display 0 for actual 0 values 2011-05-31 17:45:47 +02:00
Tyron Madlener
a311518494 If the PMA_formatNumber() parameters would result in 0.0, it displays <0.1 instead 2011-05-31 17:45:47 +02:00
Rouslan Placella
6077cfb9a2 Disabled the "Edit Routine" and "Export Routine" links if the user cannot perform these operations. 2011-05-31 15:32:40 +01:00
Tyron Madlener
226ca36c9c Display 0 for actual 0 values 2011-05-31 14:05:32 +02:00
Rouslan Placella
f964639676 Backquote Routine parameters in the generated query. 2011-05-31 11:41:17 +01:00
Tyron Madlener
9385012b97 If the PMA_formatNumber() parameters would result in 0.0, it displays <0.1 instead 2011-05-31 10:33:37 +02:00
Rouslan Placella
054fd49a04 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-30 13:34:18 +01:00
Marc Delisle
b71c47ca26 Remove comment for old function behavior 2011-05-29 19:43:13 -04:00
Piotr Przybylski
56768f5f4c Merge branch 'master' into drizzle 2011-05-29 18:27:58 +02:00
Marc Delisle
ae0af9e5c6 Remove author name 2011-05-28 08:29:38 -04:00
Marc Delisle
eeeca229de Undefined variable when query is too big 2011-05-28 08:23:56 -04:00
Rouslan Placella
0659c39435 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into rte 2011-05-24 22:33:51 +01:00
Piotr Przybylski
83b81dc242 Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	libraries/common.lib.php
 2011-05-24 15:13:41 +02:00
Piotr Przybylski
9f5fad2697 Cleanup: fixed argument names and order in comments, removed @uses of builtin functions, removed unused variables 2011-05-24 14:58:03 +02:00
Piotr Przybylski
8ec702efec Remove unnecessary assign in PMA_formatByteDown 2011-05-24 14:56:58 +02:00
Piotr Przybylski
fb5d25221b Return null when PMA_formatByteDown argument is null to prevent casting unavailable values to 0 2011-05-22 16:22:48 +02:00
Rouslan
058b6175c1 Recycled old Routines functionality and linked it to the new entry in the menu 2011-05-21 17:49:22 +01:00
Piotr Przybylski
7fb709c215 Make $tbl_is_view to be used as intended - check TABLE_TYPE instead of doing 20-50 useless calls to PMA_DBI_get_tables_full to get just table types for views in I_S and D_D... 2011-05-17 10:42:19 +02:00
Piotr Przybylski
be748a7d84 Case insensitive comparisons to check for I_S, tread D_D as I_S 2011-05-17 00:00:21 +02:00
Marc Delisle
e6211f0c2f Other replacements for easier reading 2011-05-09 12:57:28 -04:00
Marc Delisle
13b31956ae For easier reading, replace "!isset" with "! isset" 2011-05-09 12:49:05 -04:00
Madhura Jayaratne
27224a88c5 Bug #3298581 - Row marking, null-checkbox of inline edit broken 2011-05-07 11:16:00 +05:30
Rouslan Placella
56fc953b57 Fixed issue #2 in bug #3291301 - Problems with inline edit link for sql query 2011-05-05 08:45:09 +02:00
Rouslan Placella
bacbe54a67 Fixed issue #1 from bug #3291301 (Problems with inline edit link for sql query) 2011-05-05 08:45:06 +02:00
Marc Delisle
73c57b099e Continue to replace warning level with error level 2011-05-03 19:05:24 -04:00
Piotr Przybylski
5c39c5511f Comments formatting and PHPDoc fixes 2011-05-02 20:50:16 +02:00
Marc Delisle
932b5c2c36 Improve variable name and formatting 2011-04-18 12:30:59 -04:00
onebighack
14395afa8d Patch #3276121 Inline link goes missing after table sort 2011-04-18 12:27:37 -04:00
Marc Delisle
29dbdde4ff Avoid displaying a Back link in a error message if we are in Ajax mode 2011-03-23 08:10:22 -04:00
Michal Čihař
24396fe024 There are no empty/drop tabs anymore 2011-03-18 14:52:08 +01:00
Michal Čihař
95bc3c92aa Allow to specify value parameter for PMA_buttonOrImage 2011-03-18 14:36:10 +01:00
Marc Delisle
419d067dc3 Extra line break generated when creating user via Ajax 2011-03-02 13:01:17 -05:00
Thilanka
a994e13c33 Ajaxify browse and delete criteria in DB search 2011-02-28 12:44:44 -05:00
Michal Čihař
d1a6410766 Edit is more appropriate here 2011-02-24 16:08:22 +01:00
Marc Delisle
984cf6dbad For bug 3168757: 
- Use jQuery to make the text look and behave like a link
 2011-02-24 06:04:49 -05:00
Marc Delisle
b78bd77e41 For bug 3168757: 
- Change default link length limit to 2000
- Add text next to the image
 2011-02-24 05:21:24 -05:00
Marc Delisle
019b9de9da For proper conversion of the Edit link to Inline Edit 2011-02-22 07:48:47 -05:00
Marc Delisle
67339bab2a Current code has problems with Ajax, for example when creating a user. 
There are missing headers and this commit is an attempt to fix this
situation.
 2011-02-19 07:49:49 -05:00
Michal Čihař
cf4d86532e Link to MySQL 5.5 documentation on servers running MySQL 5.5 2011-02-17 10:59:00 +01:00
Michal Čihař
4c18383524 Better context for documentation links 2011-02-17 10:55:14 +01:00
Michal Čihař
9ce8bb0e87 This function needs to be in core.lib as it uses it 2011-02-17 10:50:47 +01:00
Michal Čihař
42cf4f8660 Factor out code for getting PHP documentation link 2011-02-17 10:44:16 +01:00
Michal Čihař
20509753ef Display documentation for chosen PHP extension. 2011-02-17 10:31:42 +01:00
Michal Čihař
69c0a887fc bug #3177136 [interface] Indicate that bookmark is being used on browse. 2011-02-10 10:15:07 +01:00
Michal Čihař
cd74e9fa5d bug #3175227 [auth] Reset user cache on login. 2011-02-08 13:15:01 +01:00
Michal Čihař
d296a5222b Avoid new lines between elements as this can lead to spaces 2011-02-02 22:55:10 +01:00
Michal Čihař
a0d08a3321 Move javascript for sliders to functions.js. 2011-02-02 16:04:22 +01:00
Michal Čihař
3cb9916d8b Do not go to the anchor after expanding slider. 2011-02-02 15:36:41 +01:00
Michal Čihař
599492943d This should clear possible floats 2011-02-02 14:12:54 +01:00
Michal Čihař
67e4994490 Single place to handle redirection. 2011-01-31 15:22:25 +01:00
Michal Čihař
dc0c6938b2 [security] Redirect external links to avoid Referer leakage. 2011-01-28 13:22:41 +01:00
Marc Delisle
5464b54e17 Start implementing conditional Ajax (in results page) 2011-01-22 09:50:12 -05:00
Marc Delisle
6094e6c644 - Bug #3151925 Page selector dropdown broken with ORDER BY query 
- PMA_pageselector() had an unused parameter
 2011-01-08 15:14:00 -05:00
Marc Delisle
4beca2fe92 Use the clip effect instead of the drop effect 2011-01-03 17:37:33 -05:00
Marc Delisle
a1ad4b295c Message was not under gettext 2010-12-27 07:14:10 -05:00
Marc Delisle
79f320e951 remove author names 2010-12-04 06:41:10 -05:00
Michal Čihař
89f03ef81b bug #3123433 [interface] Avoid double escaping of MySQL errors. 
The PMA_DBI_getError function already does escaping, so there is no need
to escape that string again on displaying.
 2010-12-02 17:14:59 +01:00
Michal Čihař
219f5a4fb9 Whitespace cleanup. 2010-12-02 17:13:47 +01:00
Michal Čihař
a480379bae Remove not used variable. 2010-12-02 17:05:57 +01:00
Herman van Rink
6d3b66059a bug #3115519: fixed XSS on search 2010-11-26 09:12:01 -05:00
Marc Delisle
9f4dc04691 no need to have a separate file for this 2010-11-05 06:30:21 -04:00
Marc Delisle
7d0c11c256 class nowrap was missing; div not allowed here 2010-10-09 09:05:54 -04:00
Marc Delisle
452dce72a2 missing end tag 2010-10-09 06:49:55 -04:00
Marc Delisle
b5cd7e69ea inline edit (in tools) and ajax mode 2010-10-08 13:21:27 -04:00
Marc Delisle
316ea9f006 prevent a call with incorrect parameter value 2010-09-19 09:26:49 -04:00
ninadsp
aed2e27b3f A better solution to the caching issues faced. Set jQuery's global Ajax parameter 'cache' to false, and also set the 'Cache-Control' header to 'no-cache' 2010-09-02 15:10:58 -04:00
Michal Čihař
d2de55cb0b Merge branch 'QA_3_3' 2010-08-31 11:44:30 +02:00
Marc Delisle
1b812f2d25 undefined variables after deleting a user 2010-08-30 12:54:12 -04:00
Michal Čihař
1d67babd52 Do not fail on non analyzed query (eg. because of parser failure). 2010-08-30 16:11:46 +02: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
Herman van Rink
b477c4cb1a Merge branch 'blinky/master' into gsoc2010-blinky 
Conflicts:
	Documentation.html - renumbered 6.28 to 6.29
 2010-08-25 16:59:54 +02:00
ninadsp
7f9d141a85 Removed the blank new line at the end, which was causing issues 2010-08-24 18:25:09 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Marc Delisle
22eaa592ca unused code 2010-08-20 08:43:09 -04:00
Michal Čihař
862e3ca2a7 Merge branch 'QA_3_3' 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
 2010-08-20 13:40:37 +02:00
Michal Čihař
41145feb12 Merge branch 'MAINT_3_3_5' into QA_3_3 
Conflicts:
	ChangeLog
	libraries/common.lib.php
 2010-08-20 13:36:49 +02:00
Michal Čihař
bf60ec82e9 Fix possible XSS on IIS redirect page. 2010-08-20 11:20:10 +02:00
Michal Čihař
5128563d07 Merge branch 'QA_3_3' 
Conflicts:
	libraries/common.lib.php
	libraries/core.lib.php
 2010-08-20 11:11:27 +02:00
Michal Čihař
893abac3e5 bug #3042495 [core] Move PMA_sendHeaderLocation to core.lib.php. 
It might be needed from common.inc.php even if PMA_MINIMUM_COMMON is
defined.
 2010-08-20 11:09:15 +02:00
Herman van Rink
f273e6cbf6 Fix XSS on error with very long query. 2010-08-20 10:42:03 +02:00
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
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
lorilee
841fba88d5 Removing alt text since it interferes with tooltip 2010-08-05 18:23:18 -07:00
lorilee
646627b911 Updated tooltips using the new tooltip plugin; the code in js/functions.js was moved from js/tooltip.js (with new code appended); <sup> IDs not needed 2010-08-05 18:05:25 -07:00
Crack
53e8d75c0f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/db_links.inc.php
	libraries/tbl_links.inc.php
 2010-08-01 23:19:21 +02:00
lorilee
f1686d5172 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 
Conflicts:
	libraries/display_export.lib.php
 2010-07-29 14:12:36 -07:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local 
Conflicts:
	server_status.php
 2010-07-29 14:14:26 +03:00
lorilee
8120a00af7 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-28 15:03:28 -07:00
lorilee
1faaa80b51 Fixing HTML markup 2010-07-28 15:00:36 -07:00
Michal Čihař
05160b3e03 No need for full columns here. 2010-07-27 10:07:55 +02:00
Michal Čihař
39aa4355a9 Convert default queries to unified expansion. 2010-07-27 10:01:58 +02:00
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
Crack
3b3f8bff69 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-13 15:03:58 +02:00
Marc Delisle
485e1736b6 make inline editing work for all cases of fmtType 2010-06-12 08:45:24 -04:00
ninadsp
42de77813c Merge remote branch 'origin/master' 2010-06-06 20:01:39 +05:30
Crack
65911c57e1 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-06-05 16:59:16 +02:00
Crack
6b2f774ba8 Add category tabs to preferences page 
Setup script refactoring
 2010-06-05 15:42:55 +02:00
Marc Delisle
f50d6694e7 bug #3011126 [display] Edit link missing after long query 2010-06-05 08:28:24 -04:00
Marc Delisle
c3ea6fb22b bug #3011126 [display] Edit link missing after long query 2010-06-05 08:20:36 -04:00
ninadsp
049c90ee0b Edited PMA_generate_html_tab() to add the id parameter 
Necessary for attaching Ajax calls with jQuery to some tab links
 2010-06-04 21:27:25 +05:30
ninadsp
bd139f2465 document.write() conflicts with jQuery. 
Instead, appending Inline Edit to parent div (class="tools") with
$.append(), the recommended method.
$('body').append() is executed late, and hence, not used.
 2010-05-29 01:44:51 +05:30