Commit Graph

204 Commits

Author SHA1 Message Date
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ř
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ř
be0f47a931 Fix XSS on hostname. 2010-08-18 12:13:59 +02:00
Michal Čihař
cd205cc55a Fix XSS on username. 2010-08-18 12:12:09 +02:00
Michal Čihař
7dc6cea065 Fix XSS on tablename and pred_tablename. 2010-08-18 12:09:13 +02:00
Michal Čihař
6028221d97 Fix XSS on dbname. 2010-08-18 12:07:45 +02:00
Michal Čihař
2a1233b69c Fix XSS on checkprivs. 2010-08-18 12:05:32 +02:00
ninadsp
0b2b21712e Added documentation to PHP files 2010-08-15 01:50:47 +05:30
ninadsp
e8e87ae675 Resolved conflicts left over from previous merge 2010-07-29 22:53:07 +05:30
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
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
Marc Delisle
cdcc5d7443 Merge branch 'QA_3_3' 2010-07-25 13:33:03 -04:00
Marc Delisle
053d6ca88e bug #3033063 [core] Navi gets wrong db name 2010-07-25 13:32:35 -04:00
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
9391e869ac The updated privileges are now wrapped with dfn tags as well. 2010-07-23 23:17:15 +05:30
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
ninadsp
13ec1423f6 Minor bug due to which the ajax response to revoke users was failing. Fixed it 2010-07-23 00:23:38 +05:30
ninadsp
4054332641 Update the privileges field in the usersForm table when the user is changed 2010-07-23 00:18:15 +05:30
ninadsp
85d42b8a57 Newly copied user too is appended to the table now 2010-07-23 00:03:12 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Marc Delisle
4e5061d323 Generate password only available if JS is enabled 2010-07-19 10:03:17 -04:00
ninadsp
4b18b4c7d6 When a new user is created, the user's overview table on the top is now updated to reflect the newly added user's initial 2010-07-16 19:36:12 +05:30
ninadsp
fcae63bbd7 When a new user is added, his details are now appended to the user's table 2010-07-13 03:25:53 +05:30
ninadsp
4f1c348074 Added an id to the edit users form so that the check all/uncheck all
calls to setCheckboxes() will work.
2010-07-04 01:50:11 +05:30
ninadsp
dac68adc52 Show the SQL queries too in an Ajax response. 2010-06-30 01:20:09 +05:30
ninadsp
7f062310c6 Fixed the bug where the initials_table division landed up at the bottom
of the page after an ajax request completed.
Also, fixed the issue due to which the edit users dialog was empty
2010-06-30 00:38:28 +05:30
ninadsp
a87c4fc363 Removed extra calls to PMA_ajaxResponse and added a common call to it
for multiple actions.  Modified the code for paginating the users table
with ajax, however it is still buggy
2010-06-27 03:27:29 +05:30
ninadsp
06a7736b88 Ajaxified Export Privileges. Added classes to Export and Edit links in
the Users table
2010-06-21 03:18:51 +05:30
ninadsp
1a9526a4ff Improved the behaviour for an Ajax request to Reload Privileges by using
the new PMA_ajaxResponse. Modified the response for Revoke User in an
Ajax request.
2010-06-21 02:56:44 +05:30
ninadsp
fd5e2dc3c1 Fixed issues with submit of Add User form over Ajax.
Changed the id for the Add User Form to prevent conflict for the
setCheckboxes call
2010-06-17 18:21:03 +05:30
ninadsp
834b36bd6a Merge remote branch 'origin/master' 2010-06-09 22:49:38 +05:30
Marc Delisle
5ed4790db0 move remaining old-format messages to the script that uses them, when possible 2010-06-08 12:32:18 -04:00
ninadsp
160f4314eb Merge remote branch 'origin/master' 2010-06-03 22:34:52 +05:30
Marc Delisle
5dfe98a378 bug [privileges] List of tables not shown when the db name has a wildcard 2010-06-02 12:37:19 -04:00
Marc Delisle
5d525e89eb bug [privileges] List of tables not shown when the db name has a wildcard 2010-06-02 12:32:54 -04:00
ninadsp
ed3e6a2925 Used the correct method, PMA_showMessage() instead of
$message->display()
2010-05-27 20:27:55 +05:30
ninadsp
d14abc17ca Attached Ajax event handler to Reload Privileges 2010-05-26 18:27:21 +05:30
ninadsp
0e910967b0 Attached jQuery event handlers to Add a New User using
jQueryUI Dialog. Work in progress, still need to
handle submission of form
2010-05-26 11:46:08 +05:30
Michal Čihař
fd7ced8404 This don't have to be plural. 2010-05-25 14:30:13 +02: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
f8f475419d gettext conversion 2010-05-06 12:49:07 -04:00
Michal Čihař
352ee7834c Reintroduce escaping. 2010-05-05 11:53:32 +02:00
Michal Čihař
139339eb3c Proper context. 2010-05-05 11:53:31 +02:00
Michal Čihař
2f67c8331c Use context here as it might be translated differently. 2010-05-05 11:48:36 +02:00
Marc Delisle
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
ab57b74d40 similar messages had been merged 2010-05-03 07:35:37 -04:00
Michal Čihař
e4e121234b There is no longer message for MySQL < 5. 2010-04-19 14:25:17 +02:00