Commit Graph

53 Commits

Author SHA1 Message Date
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
2013-05-01 00:51:15 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
bee0134b1f PMA_DBI_get_tables_full --> PMA_DBI_geTablesFull 2013-04-30 23:27:27 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate
In some languages this makes difference in translating, so it's better
to give translators full context.
2013-04-25 14:22:31 +02:00
Michal Čihař
5b73bf9788 Fix generating links to docs
This makes correct links to docs when run from setup.
See bug #3886 and gh issue #279.
2013-04-22 14:05:40 +02:00
Kasun Chathuranga
1a459f3575 Fix incorrect listing of records from to count 2013-04-13 23:19:49 +05:30
Madhura Jayaratne
b4d8e07a37 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/Util.class.php
2013-03-28 17:41:41 +05:30
Madhura Jayaratne
b3db1f0d6f Change mysqlDie() to return the error message when $exit parameter is false 2013-03-28 17:34:40 +05:30
Marc Delisle
a0e85f3cdc Incorrect comment 2013-03-28 07:47:12 -04:00
Marc Delisle
6bbe53de25 Fix "Invalid argument supplied for foreach()" in case a DROP TABLE x statement was typed 2013-03-21 12:58:37 -04:00
Dieter Adriaenssens
525fe373ee fix coding style : add space before argument 2013-03-14 13:37:16 +01:00
Marc Delisle
88aa108672 Merge pull request #197 from shamika050/fix-grid_editing
Contest-1 / Solve the problematic scenario
2013-03-03 10:28:36 -08:00
shamika
26021f05f8 Bug Fix:#3813 grid editing utf8 set/enum value 2013-02-24 13:02:14 +05:30
Samith Dassanayake
1ebace0afd Fixed coding style issue 2013-02-21 19:35:59 +05:30
Samith Dassanayake
c4d14774c3 Fixed #3833 Undefined variable: sql_limit_to_append.
Initialized the varible sql_limit_to_append,
Since isset($x) returns true when $x=''(which is not the expected behaviour of the usage), used the function empty()
2013-02-20 23:38:53 +05:30
Marc Delisle
d26b112f40 Fix merge conflict 2013-02-15 12:36:10 -05:00
Atul Pratap Singh
cf200355a7 Fixing bug: 3798, correcting CHAR_LENGTH use, for blob in where clause 2013-02-12 11:14:42 +05:30
Herman van Rink
af37acd845 Use plain http for docs.phpmyadmin.net as the SSL certificate is only for *.readthedocs.org 2013-02-08 12:03:39 +01:00
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Rouslan Placella
58998ed7a3 Merge branch 'QA_3_5'
Conflicts:
	libraries/common.lib.php
	po/uk.po
	tbl_change.php
	test/libraries/common/PMA_extractColumnSpec_test.php
2013-01-21 13:34:31 +00:00
Dieter Adriaenssens
be2c09f36c improve coding style 2013-01-15 20:15:50 +01:00
Marc Delisle
22e79ee918 The ShowHint directive was not obeyed for some hints 2013-01-08 17:05:42 -05:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Marc Delisle
4547c9a7c8 Handle the multiple columns Change input (for IE < 9) 2012-12-18 08:19:13 -05:00
Marc Delisle
b0a6275f87 Remove redundant PMA_ prefix 2012-12-10 14:25:54 -05:00
Marc Delisle
7ff92fd6a7 Bug #3591442 Fatal error when dropping table 2012-12-10 13:01:54 -05:00
Marc Delisle
db210da098 Clarify the conditions 2012-12-07 07:44:36 -05:00
Marc Delisle
c39268c244 Button tag works correctly in IE 9 2012-12-06 07:19:34 -05:00
Rouslan Placella
2e1bc1bd8d Refactored menuPrepare and menuResize into a jQuery plugin
Also integrated this plugin with both the main menu and the resizable
menu on the table structure page
2012-11-24 17:25:37 +00:00
Rouslan Placella
177b459822 Fixed bug #3583315 - Query doesn't load in the querywindow when clicking on edit 2012-11-19 23:36:05 +00:00
Michal Čihař
15b554c8b6 Use docs.phpmyadmin.net instead of phpmyadmin.readthedocs.org 2012-11-13 14:19:44 +01:00
Michal Čihař
d0917d9549 Adjust testsuite to new documentation 2012-11-12 10:03:29 +01:00
Michal Čihař
a3069af822 Adjust bbcode handling to new documentation 2012-11-12 09:59:05 +01:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Marc Delisle
c4ff4bee20 Remove the Synchronize feature 2012-11-07 13:09:47 -05:00
Marc Delisle
859c0ea41b Fix "Array to string conversion" error 2012-11-07 07:51:12 -05:00
Rouslan Placella
7356b407ad Rewrite and integration of js/common.js 2012-10-30 20:23:59 +00:00
Rouslan Placella
eedf07e915 Dropped getReloadNavigationScript(), this is already handled by Footer.class.php 2012-10-30 20:23:59 +00:00
Rouslan Placella
50266d206b Fixed updating of the title of the page 2012-10-30 20:16:58 +00:00
Rouslan Placella
8012c6fb62 Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable 2012-10-30 20:16:57 +00:00
Rouslan Placella
8d4da3ea67 Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel 2012-10-30 20:16:57 +00:00
Rouslan Placella
31a3f1d73c Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator 2012-10-30 20:16:57 +00:00
Rouslan Placella
6f8544c5ef Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping 2012-10-30 20:16:57 +00:00
Rouslan Placella
5f66444f5b Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB 2012-10-30 20:16:56 +00:00
Rouslan Placella
1fd7ddd976 Fixed invalid HTML 2012-10-30 20:10:22 +00:00
Rouslan Placella
fcd07e21d5 Implemented tables pagination in the navigation 2012-10-30 20:10:22 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Chanaka Indrajith
e6afd60299 Call to undefined function backquote() 2012-10-03 06:08:09 -04:00