Commit Graph

48 Commits

Author SHA1 Message Date
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
Dieter Adriaenssens
94c6836f8b fix coding style : control structures 2011-09-05 14:28:17 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02:00
Piotr Przybylski
f36b2e5441 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/db_links.inc.php
	libraries/server_links.inc.php
	tbl_structure.php
	themes/pmahomme/css/theme_right.css.php
2011-07-21 16:21:16 +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
480fe9f78c Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 17:37:50 +02:00
Piotr Przybylski
b5d450ff31 PMA_MYSQL_INT_VERSION is at least 50015 2011-07-13 17:29:06 +02:00
Piotr Przybylski
bf9469ec18 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-13 12:25: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
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
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
Piotr Przybylski
e51a48a3fa Drizzle: hide Privileges tab in database links 2011-05-25 20:01:59 +02:00
Rouslan
44301dd250 Added new tabs for Routines, Triggers and Events 2011-05-21 17:43:19 +01: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
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ř
36b6328931 Remove drop tab from database tabs. 2010-07-27 09:42:08 +02:00
Crack
b2674e9d59 change tab order in server, db and table menus 2010-07-26 20:56:19 +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
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
50dabaf4e7 Removed the inline JavaScript confirmLinkDropDB() call and added an id
"drop_db_anchor" to the tab
2010-06-05 14:56:08 +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
2182098af6 strings to gettext, second batch 2010-05-04 20:07:19 -04:00
Marc Delisle
f55823f47f strings to gettext, first batch 2010-05-03 12:57:46 -04:00
Marc Delisle
819324ede6 remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software 2010-03-06 18:04:17 +00:00
Marc Delisle
c4a2ec7f1b string was hardcoded 2009-09-06 11:52:07 +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ř
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +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
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
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
Marc Delisle
b7fc1e34b7 better icon for Designer 2007-01-04 18:22:08 +00:00
Michal Čihař
fb9a3a598e Check before commit! 2006-11-17 08:49:30 +00:00
Michal Čihař
cac4247057 Rename db_* files to drop useless _details part. 2006-10-25 12:25:01 +00:00