nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,475 Commits 1 Branch 0 Tags
e076ec85e174038c7ffe17f701342e52f4413afe
Commit Graph

179 Commits

Author SHA1 Message Date
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
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
Martynas Mickevicius
b32e5879fd Merge commit 'origin/master' into local 2010-08-16 01:01:30 +03:00
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
Martynas Mickevicius
b0888714b6 Merge commit 'origin/master' into local 
Conflicts:
	server_status.php
 2010-07-29 14:14:26 +03:00
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
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
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
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Martynas Mickevicius
d814efcfb6 added the chart in the profiling window 2010-06-15 20:13:34 +03:00
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