Commit Graph

172 Commits

Author SHA1 Message Date
Tufan Barış YILDIRIM
66c10144f3 Missing condition for confirmation message 2012-04-22 05:50:54 -04:00
Marc Delisle
a26aec4d80 bug #3516089 [structure] DROP does not work on defective VIEWs 2012-04-21 16:29:05 -04:00
Yuichiro
24b573720c add messages to gettext 2012-01-25 17:42:57 +01:00
Marc Delisle
a822895df6 bug #3455021 Fatal error: Cannot redeclare PMA_extract_db_or_table() 2011-12-12 12:44:12 -05:00
Madhura Jayaratne
35b18e57a2 Coding style improvements - Multiline assignments 2011-12-07 23:28:50 +05:30
asdfrede
d39a230992 Fixed bug #3408377 - Deleting table from the DB does not change the table counter 2011-12-02 00:54:35 +00: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
Marc Delisle
ecb05de4f6 Fix merge conflicts 2011-10-23 10:33:01 -04:00
Marc Delisle
694c1cdf75 bug #3427256 [interface] no links to browse/empty views and tables 2011-10-23 10:27:06 -04:00
Piotr Przybylski
4a5cb00df5 Fix jQuery UI version number
It's 1.8.16, not 1.8.6
2011-10-11 02:00:45 +02:00
Piotr Przybylski
ac365e0262 Upgrade jQuery UI to 1.8.6 2011-10-10 22:35:36 +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
Madhura Jayaratne
e42539a817 Use PMA_getIcon() 2011-09-21 14:44:23 +05:30
Madhura Jayaratne
1f26c2f841 Wrap some long lines 2011-09-14 15:29:09 +05:30
Madhura Jayaratne
5959ae1c5a Coding style improvements 2011-09-14 15:09:48 +05:30
Madhura Jayaratne
2260e10814 Proper indentation for switch-case statement 2011-09-14 15:02:46 +05:30
Dieter Adriaenssens
0ade69e84d use include() instead of require() when including file conditionally 2011-09-06 17:57:48 +02:00
Piotr Przybylski
f678a45cd2 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/database_interface.lib.php
2011-08-24 21:40:52 +02:00
Piotr Przybylski
da6c5b7129 Inline PMA_DBI_get_default_engine(), this one-liner is used only once 2011-08-23 22:19:21 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master'
Conflicts:
	js/tbl_select.js
2011-08-12 00:10:17 +05:30
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Ammar Yasir
7c66a8bed5 Merge remote branch 'phpmyadmin/master'
Conflicts:
	js/highcharts/highcharts.js
2011-07-22 16:50:30 +05:30
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ř
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +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
Ammar Yasir
ea171beebe Merge remote branch 'phpmyadmin/master' 2011-07-10 08:13:46 +05:30
Piotr Przybylski
382c020a85 Merge remote-tracking branch 'origin/master' into drizzle 2011-07-09 21:50:23 +02:00
Thilanka Kaushalya
2196080954 Fixed the issue adding time picker to insert dialog 2011-07-09 10:26:00 -04:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02: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
Ammar Yasir
fb8a4956a8 Merge remote branch 'phpmyadmin/master' 2011-06-21 04:35:24 +05:30
Piotr Przybylski
c2b06f0a11 Don't use OPTIMIZE TABLE and REPAIR TABLE with Drizzle 2011-06-19 21:10:42 +02:00
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Ammar Yasir
9498f5d4cd Merge remote branch 'phpmyadmin/master' 2011-06-17 01:06:38 +05:30
Piotr Przybylski
17f8e16141 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_processlist.php
2011-06-15 15:38:04 +02:00
Thilanka Kaushalya
161f8977fa Fixed the delay at dialog load in table insert 2011-06-15 11:35:59 +05:30
Thilanka Kaushalya
f2588c536d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-10 22:15:57 +05:30
Thilanka Kaushalya
b53ac0870c Apply ajax behavior to the insert to table option in db structure 2011-06-10 11:06:36 +05:30
Ammar Yasir
763fa66d72 Merge remote branch 'phpmyadmin/master' 2011-06-09 02:54:33 +05:30
Piotr Przybylski
50e0a41aa3 Don't load db_routines.inc.php and db_events.inc.php for Drizzle 2011-06-08 00:23:05 +02:00
Piotr Przybylski
4b344cb40b Don't load replication.inc.php for Drizzle 2011-06-08 00:20:00 +02:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Piotr Przybylski
a56d77fb67 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-06 12:12:42 +02:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false.
At least this seems to be the coding standard, so make all files
compliant.
2011-06-06 11:55:09 +02:00