Commit Graph

269 Commits

Author SHA1 Message Date
Michal Čihař
439a24c6a2 bug #3183548 [ajax] AJAX response needs HTTP header as well.
Otherwise we would use default charset from PHP insted of utf-8 we use.
2011-02-17 10:08:18 +01:00
Michal Čihař
e9bac1dfbb Merge branch 'QA_3_3' 2011-02-11 14:23:54 +01:00
Michal Čihař
a5464b4daf Avoid using all users query as default when browsing. 2011-02-11 14:23:34 +01:00
Michal Čihař
1164c5b7fb Add link to documentation 2011-02-10 10:37:58 +01:00
Michal Čihař
9517f08a96 Make this sentence 2011-02-10 10:33:47 +01:00
Michal Čihař
69c0a887fc bug #3177136 [interface] Indicate that bookmark is being used on browse. 2011-02-10 10:15:07 +01:00
Marc Delisle
5464b54e17 Start implementing conditional Ajax (in results page) 2011-01-22 09:50:12 -05:00
Marc Delisle
c72cc2c8f5 Browse foreign values did not work with inline edit
Use known message "Browse foreign values" instead of "Search foreign
data"
Use jQuery to attach handler instead of "onclick" for
browse_foreigners.php when called from sql.php
2010-12-24 07:50:42 -05:00
Michal Čihař
57265808b8 Do not fail if transformations are not enabled for this table, but request asks to enable them. 2010-12-02 17:20:09 +01: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
Marc Delisle
08c0f4e921 undefined variables 2010-10-31 05:51:38 -04:00
Marc Delisle
fe5577568d bug #3072492 Error for wrong SQL disappears 2010-10-08 06:23:27 -04:00
Marc Delisle
e91e87861b make USE work in the context of ajaxification 2010-10-03 07:45:15 -04:00
Marc Delisle
582fe81aa3 notice on undefined variable 2010-09-04 07:55:26 -04:00
Marc Delisle
98a5ba7317 misleading variable name 2010-09-04 07:01:30 -04: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
ninadsp
cce1ef0eda Fixed the display_query undefined error by adding a check to see if it exists 2010-08-26 22:52:38 +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
Marc Delisle
e6c7aaad34 simplify logic and rename parameter 2010-08-22 08:52:15 -04:00
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
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ř
fa30188dde Escape html chars in form values. 2010-08-18 11:38:19 +02:00
ninadsp
c0ee037c59 Resolved a Merge Conflict 2010-08-17 18:25:03 +05:30
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03:00
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
Marc Delisle
bda213a5ac bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-11 10:48:05 -04:00
Marc Delisle
dda6de20d2 bug #3042706 [pmadb] Relations, bookmarks, etc deleted after table drop 2010-08-10 17:55:04 -04:00
ninadsp
a458147969 Merge from upstream. Resolved a conflict in js/functions.js 2010-08-05 23:51:14 +05:30
ninadsp
b19fa7c60f Retrieve a link instead of the dropdown fields when the number of foreign fields is more than ['ForeignKeyMaxLimit']. Could use an icon in the anchor like it is in tbl_change.php 2010-07-31 02:02:16 +05:30
ninadsp
6547920e8a The anchor is now correctly generated for a saved relational field during inline edit with the correct where clause. Trying to fix the bug with ['ForeignKeyMaxLimit'] 2010-07-31 01:34:47 +05:30
ninadsp
43ed78a0f8 Transformed values are returned from server for newly edited values. Handling of mimetypes other than text/plain needs to be implemented 2010-07-29 23:36:35 +05:30
ninadsp
cd42d616f7 Removed unresolved section 2010-07-29 21:26:21 +05:30
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
ninadsp
4190a5883a Improved handling of relational fields after saving inline edits. Still need to fix the anchor that is being generated, where clause is missing 2010-07-28 02:58:38 +05:30
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +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ř
ee767e2d3d No need to explicitely include relation.lib its anyway included in common.inc 2010-07-26 16:17:59 +02:00
ninadsp
fd4b33de85 Added handling of enum values to inline editing 2010-07-26 01:21:52 +05:30
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
25dbe9b039 Relational values are now retrieved from the server for inline editing. However, the displaying of relational values after a successful inline edit has to be handled better. The link to the sql query is lost, and we dont know how the relational display column setting will be handled 2010-07-24 00:32:50 +05:30
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Martynas Mickevicius
b7daf5d985 removed overlib dependancy. Written simple tooltip. 2010-07-23 16:53:46 +03:00
Martynas Mickevicius
bcbd662f48 added tooltip JS includes for other chart places. 2010-07-21 19:35:15 +03:00
Michal Čihař
45059994b1 Correct message, this one tells that the query is validated. 2010-07-21 13:53:08 +02:00
ninadsp
e9731e39c7 Added a few lines to handle inline edit requests 2010-07-21 00:12:17 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
7da51f1a8e Empty row result set was not being handled correctly for Table Search page, fixed it 2010-07-16 19:10:48 +05:30
ninadsp
98676380f9 Improved error handling. The ajax message was not being properly shown
for an empty result set
2010-07-14 20:21:47 +05:30
ninadsp
4f3b8b96ae If in an ajax query, we need to show the query and the time taken to process the query. Added code to get this working 2010-07-03 02:52:09 +05:30
ninadsp
5c1052ad96 Included the sql.js file, added teh container division sqlqueryresults
when generating the results table.  All cases have not been handled yet.
2010-07-01 02:33:31 +05:30
ninadsp
eb0e019fa6 Rudimentary script in place for retreiving SQL query results by ajax,
and paginating the results table in place.
2010-06-30 01:18:47 +05:30
ninadsp
e2cef4bc23 Suppress the printing of the serverlinks and topmenucontainer divs when
in an ajax request
2010-06-28 01:24:05 +05:30
Martynas Mickevicius
d814efcfb6 added the chart in the profiling window 2010-06-15 20:13:34 +03: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
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
632211d065 gettext conversion 2010-05-09 16:24:32 -04:00
Marc Delisle
2586524b03 gettext conversion; clarify code 2010-05-06 07:48:38 -04:00
Marc Delisle
17c9fb4d28 gettext conversion 2010-05-05 12:57:30 -04:00
Michal Čihař
c2de4dd8d9 Add full uncompressed version of jquery ui. 2010-04-15 09:34:52 +02:00
Marc Delisle
360101dbfb bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:30:36 -04:00
Marc Delisle
1f62ea1932 bug #2973949 SQL History broken (need to revert patch #2899969) 2010-04-04 17:21:48 -04:00
Michal Čihař
a2a0d9bb38 Avoid multiple loading of jQuery. 2010-04-01 17:19:37 +02:00
Michal Čihař
4dd524eaf1 Use ngettext for number of inserted rows. 2010-03-30 14:51:09 +02:00
Michal Čihař
44d5cb8548 Use ngettext for number of deleted rows. 2010-03-30 14:41:46 +02:00
Michal Čihař
9e345b4ab8 Use ngettext for number of affected rows. 2010-03-30 14:32:06 +02:00
Marc Delisle
9785bbc561 remove author names 2010-03-26 17:44:10 -04:00
Marc Delisle
58ebfd4591 jquery in subdirectory of js; trying jquery-ui toggle effect 2010-03-23 17:08:47 -04:00
Marc Delisle
f8fa3b4ede jQuery and slider effect 2010-03-21 07:36:39 -04:00
Michal Čihař
201d0e892c Load mootools in every page. 2010-01-25 11:49:46 +00:00
Michal Čihař
78b00824eb [core] Updated mootools to fix some glitches with Safari.
Mootools are now in separate files as distributed upstream.
2010-01-04 15:35:23 +00:00
Marc Delisle
526dce65cb 3.3 2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4 3.3 2009-12-31 13:09:18 +00:00
Marc Delisle
90c5ef65cd patch #2899969 [core] Session lock blocks working from a second window 2009-12-17 17:27:47 +00:00
Marc Delisle
cda5b04eab improve wording in comment 2009-10-23 10:22:00 +00:00
Marc Delisle
1419fcf3c2 remove deprecated parameter of PMA_Table::countRecords() 2009-10-23 10:02:09 +00:00
Marc Delisle
2a893aba92 [security] XSS: Insufficient output sanitizing in bookmarks 2009-06-30 10:48:08 +00:00
Marc Delisle
38fea0cc9e in SESSION, userconf renamed to tmp_user_values to avoid confusion with the future db-based user preferences 2009-06-20 16:36:58 +00:00
Michal Čihař
9605363dfb Escape zero_rows (this is not dangerous, but I think it should be escaped). 2009-04-09 14:20:44 +00:00
Marc Delisle
c19b43557f message "Bookmark created" is not displaying 2009-01-24 16:43:56 +00:00
Marc Delisle
c010da50d8 bug #2473127 [display] Deleting rows displays tbl structure, not contents 2009-01-01 21:39:21 +00:00
Michal Čihař
56941e509c Adding @package, second part. 2008-11-24 11:05:40 +00:00
Michal Čihař
37315b0c79 Document some require/includes as phpdoc otherwise takes random block before to document it. 2008-11-24 10:02:56 +00:00
Marc Delisle
2ac75d4591 upgrade to mootools 1.2; temporarily deactivate the color picker that does not work with this mootools version 2008-07-14 19:52:16 +00:00
Marc Delisle
606619b6b9 small code cleanup 2008-07-09 18:01:56 +00:00
Marc Delisle
b9baa825c1 display options (work in progress) 2008-05-21 15:49:57 +00:00
Sebastian Mendel
32c61a2ff6 reworked bookmarking 2008-05-09 12:37:30 +00:00
Marc Delisle
4f98c84dd7 dead code 2008-03-16 11:28:18 +00:00
Sebastian Mendel
eb07812dbb aggregate more index code into PMA_index class 2008-02-07 14:59:02 +00:00
Marc Delisle
cf1303f0fe Avoid a No tables found when deleting the last table of a db and the table limit offset becomes greater than the number of tables 2007-12-29 20:38:27 +00:00
Marc Delisle
78a3a6dacb parser (analyzer) the section_before_limit should not contain the LIMIT clause itself; and extract the limit_clause 2007-12-16 15:18:23 +00:00
Marc Delisle
9385dde992 bug #178988 [display] space before SHOW COLUMNS 2007-11-12 17:55:31 +00:00
Marc Delisle
a4be8e0efd bug #1824506 [profiling] Profile command repeated on older MySQL servers 2007-11-02 17:34:58 +00:00
Marc Delisle
c94fd548d6 new strInsertedRowId 2007-10-19 16:16:49 +00:00
Marc Delisle
6250cd0506 strRowsInserted 2007-10-19 11:40:27 +00:00
Marc Delisle
e9da128bc0 strRowsDeleted, strRowsAffected 2007-10-18 17:15:39 +00:00
Sebastian Mendel
236198619d should save before committing ... (missed some comments) 2007-10-17 08:05:57 +00:00