gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,859 Commits 12 Branches 481 Tags 2.4 GiB
0ece94e5f3
Commit Graph

156 Commits

Author SHA1 Message Date
Marc Delisle
37dc085ef1 Merge pull request #916 from dhananjay92/Bug#4275 
Fix for Bug#4275
 2014-02-11 12:50:12 -05:00
Dhananjay Nakrani
52084d839c Fix for Bug#4275 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 14:06:36 +05:30
Dhananjay Nakrani
9d66a521a1 Contest-5 Bug#4276. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-02-09 13:26:33 +05:30
Marc Delisle
99b477ffd4 Fix merge conflicts 2013-10-06 09:40:17 -04:00
Marc Delisle
a498a6c8cb bug #3995 Drizzle server charset notice 2013-10-06 09:32:24 -04:00
Madhura Jayaratne
3b17233f25 Remove HTML, PHP mix 2013-09-24 16:58:51 +05:30
Marc Delisle
668c55a437 Fix merge conflicts 2013-09-24 06:55:16 -04:00
Marc Delisle
256fcb61fe bug #4099 Server/library difference warning: setting is ignored 2013-09-24 06:49:39 -04:00
Marc Delisle
5e70597251 Fix codestyle 2013-09-08 06:51:58 -04:00
Michal Čihař
0a3d1d5be8 Better names for URL generating functions 2013-08-07 10:58:17 +02:00
Michal Čihař
d1bb142e87 Remove unused param from PMA_Util::showMySQLDocu 2013-08-07 08:48:50 +02:00
Michal Čihař
351acd74af Demo server support 
This merges messages used in demo server to allow their translations and
consistent handling like other messages. Messages are enabled by
$cfg['DBG']['demo'].
 2013-07-30 14:09:06 +02:00
Michal Čihař
285a9a0f3f Merge remote-tracking branch 'origin/QA_4_0' 2013-07-30 10:18:05 +02:00
Michal Čihař
4da684e7b6 Fixed escaping in error message asking for translations 2013-07-30 10:17:32 +02:00
Michal Čihař
1346134199 Various coding style improvements 2013-07-10 15:05:05 +02:00
Marc Delisle
b39aeb1f89 Remove author name 2013-06-16 08:10:16 -04:00
Michal Čihař
b6073bf722 Whitespace cleanup 2013-06-11 08:52:51 +02:00
Marc Delisle
4a91c5753c Fix merge conflicts 2013-06-08 13:36:15 -04:00
Marc Delisle
30e0e3648d bug #3921 Call to undefined function PMA_isSuperuser() if default server is not set 2013-06-08 13:27:29 -04:00
Marc Delisle
61b46911f1 Merge branch 'QA_4_0' 2013-06-02 09:21:39 -04:00
Marc Delisle
d2e217160b bug #3961 Avoid Suhosin warning when in simulation mode 2013-06-02 09:21:00 -04:00
Madhura Jayaratne
01cdc5cbf7 Few renamings that got missed 2013-05-24 19:53:52 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Marc Delisle
d44367e4db Fix merge conflicts 2013-05-15 13:07:22 -04:00
J.M
529903e0dd Fix bug #3907 undefined variables, function parameter problems 
Thanks Rasmus Lerdorf for analyzing!
 2013-05-13 11:27:56 +02:00
Michal Čihař
1b9d9dd438 Wrap some too long strings 2013-05-10 09:48:37 +02:00
Kasun Chathuranga
99c5c0ef49 PMA_DBI_get_client_info --> PMA_DBI_getClientInfo 2013-05-04 08:37:58 +05:30
Kasun Chathuranga
b0c52a8729 PMA_DBI_get_proto_info --> PMA_DBI_getProtoInfo 2013-05-04 08:36:58 +05:30
Kasun Chathuranga
5bc8b71eda PMA_DBI_get_host_info --> PMA_DBI_getHostInfo 2013-05-04 08:36:11 +05:30
J.M
0b3b113b39 [interface] Make warning about existing config directory clearer 2013-05-01 21:00:45 +02:00
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
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
Samith Dassanayake
16fcf13983 Fixed coding style 2013-03-08 22:43:17 +05:30
Samith Dassanayake
c88420a247 [Contest1] No hard-coded icons in css 
Modified "list-style-type" to "none" for the list items that has an image as the bullet point and aligned them
 2013-03-02 22:07:48 +05:30
Dieter Adriaenssens
49371bbb85 Better description 2013-02-13 14:38:06 +01:00
Michal Čihař
1e4d8e2996 Merge branch 'master' of git://github.com/DronRathore/phpmyadmin into DronRathore-master 
Conflicts:
	index.php
 2013-01-10 08:46:40 +01:00
Dron Rathore
1176ea8b7c Fixed a Typo. 
Typo.
 2013-01-10 12:56:57 +05:30
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Michal Čihař
a6e5286467 Fix links to FAQ 2012-11-12 14:15:45 +01:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00
Rouslan Placella
963a196fb1 Renamed PMA_Language_select and dropped use of echo in this function 2012-11-05 20:26:12 +00:00
Rouslan Placella
9fd82511c8 Open phpinfo in a new window 2012-10-30 20:24:00 +00:00
Rouslan Placella
49d2d6f5fb Fixed behavior of NavigationDisplayServers configuration directive 2012-10-30 20:16:57 +00:00
Rouslan Placella
41ddd1cc6a Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers 2012-10-30 20:16:57 +00:00
Rouslan Placella
237e7f11c9 Avoid redirecting to self 2012-10-30 20:10:21 +00:00
Rouslan Placella
4d4c8a9bad Update recent tables through index,php instead of navigation.php 2012-10-30 20:10:20 +00:00
Rouslan Placella
1b69d0bf55 Drop the target attrbute from links and forms 2012-10-30 20:10:20 +00:00
Rouslan Placella
797fbf4a98 Die after redirect 2012-10-30 20:10:20 +00:00
Rouslan Placella
90b7b964a9 Dropped outdated workaround 2012-10-30 20:10:20 +00:00