Commit Graph

53 Commits

Author SHA1 Message Date
Dieter Adriaenssens
f62c4a1809 coding style : control structures 2011-11-24 15:32:30 +01:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Rouslan Placella
f6982bae84 Triggers don't work with views 2011-08-09 16:41:28 +01:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Tyron Madlener
bf23143424 Merge remote-tracking branch 'origin/master'
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.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/ml.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/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/img/s_sortable.png
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
2011-07-14 15:56:31 +03:00
Tyron Madlener
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Piotr Przybylski
b5d450ff31 PMA_MYSQL_INT_VERSION is at least 50015 2011-07-13 17:29:06 +02:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Rouslan Placella
5bafd840b7 Hide Events and Triggers navigation links from unprivileged users 2011-06-23 14:58:48 +01:00
Rouslan Placella
4cbef2bdf6 Uncommented hidden navigation links 2011-06-22 14:31:09 +01:00
Rouslan Placella
387cb5c1fe Temporarily hiding links to unfinished implementations of Triggers and Events functionalities 2011-06-20 23:16:12 +01:00
Rouslan Placella
e7e97ee6c5 Hide the Routines, Triggers and Events tabs from Drizzle users. 2011-05-25 21:15:04 +01:00
Rouslan
44301dd250 Added new tabs for Routines, Triggers and Events 2011-05-21 17:43:19 +01:00
Herman van Rink
7e10c132a3 XSS in Tracking page, more 2011-05-20 12:49:49 -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
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
7be8236208 comment was no longer accurate 2010-08-20 08:46:59 -04: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
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
39e4c95813 Remove drop/empty table links from table tabs. 2010-07-27 09:42:46 +02:00
Crack
b2674e9d59 change tab order in server, db and table menus 2010-07-26 20:56:19 +02:00
Marc Delisle
084c0dbcf5 functions.js included automatically 2010-07-24 08:11:48 -04:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
ninadsp
dd58a5bc23 Removed inline calls to confirmLink() for Empty/Drop Table actions in libraries/tbl_links.inc.php 2010-07-11 23:14:41 +05:30
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
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
f6e3ae57c5 Merge branch 'QA_3_3' 2010-03-26 13:02:45 -04:00
Marc Delisle
291f2a1d1d patch #2976790 Go to the upper level after table DROP 2010-03-26 13:02:33 -04:00
Marc Delisle
6f9d95970b rfe #2890226 [view] enable VIEW rename 2010-01-02 13:34:47 +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
034baad67d message was hardcoded 2009-09-07 12:25:55 +00:00
Marc Delisle
15441ded5d do not try to display a tab that was not built 2009-08-22 11:22:50 +00:00
Marc Delisle
8480ffb665 improve function names 2009-06-07 11:09:13 +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ř
84ae0420fe Adding @package, third part. 2008-11-24 11:22:44 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
e8c3f1dbd2 bug #1871164 [GUI] Empty and navigation frame synch. 2008-01-23 17:36:28 +00:00
Sebastian Mendel
86b1e3032b remove some space wasting elements - not finally, just let see how it is in work environment and how other say about 2007-10-09 12:56:33 +00:00
Sebastian Mendel
40b3ce9fd1 use array to define included JavaScript libraries 2007-10-04 09:22:50 +00:00
Sebastian Mendel
619f6592ee removed MySQL < 5 code 2007-10-02 09:46:28 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
adb39168cc coding standard: no braces around include 2007-04-01 09:51:41 +00:00
Sebastian Mendel
d0facc3d4f splitted common.lib.php into common.inc.php, core.lib.php and common.lib.php 2007-03-20 14:16:18 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00