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

210 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
77bb53dcf8 PMA_DBI_get_table_indexes --> PMA_DBI_getTableIndexes 2013-05-01 00:15:48 +05:30
Kasun Chathuranga
b8c764a86e PMA_DBI_get_triggers --> PMA_DBI_getTriggers 2013-05-01 00:09:36 +05:30
Kasun Chathuranga
4f4853ce1e PMA_DBI_get_definition --> PMA_DBI_getDefinition 2013-05-01 00:08:44 +05:30
Kasun Chathuranga
5d55cf1975 PMA_DBI_get_procedures_or_functions --> PMA_DBI_getProceduresOrFunctions 2013-05-01 00:07:43 +05:30
Kasun Chathuranga
fbe4438628 PMA_DBI_fetch_result --> PMA_DBI_fetchResult 2013-05-01 00:05:16 +05:30
Kasun Chathuranga
7f56c8504d PMA_DBI_fetch_single_row --> PMA_DBI_fetchSingleRow 2013-05-01 00:03:03 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Kasun Chathuranga
8260a2f0b5 PMA_DBI_get_column_names --> PMA_DBI_getColumnNames 2013-04-30 23:39:18 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
2becd65b1d PMA_DBI_get_columns_full --> PMA_DBI_getColumnsFull 2013-04-30 23:33:00 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
J.M
fc62e1f9f6 Merge branch 'origin/QA_4_0' 
Conflicts:
	js/keyhandler.js
	js/tbl_structure.js
 2013-04-30 17:46:36 +02:00
J.M
e25bba8bcc Fix notice Undefined index: old_usr in AuthenticationHttp.class.php:162 2013-04-28 17:29:50 +02:00
J.M
4035c079e6 Merge branch 'origin/QA_4_0' 2013-04-28 13:15:20 +02:00
J.M
4fa8633474 Add rfe #1421 Add retry button on connection failure with config auth 2013-04-28 12:31:21 +02:00
J.M
459b2807fd Correct welcome message horizontal alignment for config auth 2013-04-28 12:00:11 +02:00
Michal Čihař
69118c1134 Various PHP coding style fixes 2013-04-26 09:54:13 +02:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0' 
Conflicts:
	ChangeLog
 2013-04-25 20:54:51 +05:30
Madhura Jayaratne
5ff9e989b7 Merge pull request #267 from kasunchathuranga/Bug3879 
Fix bug #3879 Import broken for CSV using LOAD DATA
 2013-04-25 08:14:45 -07:00
Michal Čihař
49a58c54d3 Consitent parameters naming 
Use same names in preferences and error messages as in export page.
 2013-04-25 14:38:41 +02:00
Michal Čihař
5954fe55a8 Consistent usage of colon on export pages 
All other export formats include colon in text fields description.
 2013-04-25 14:33:58 +02:00
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
Marc Delisle
303c0aaa5d Merge branch 'QA_4_0' 2013-04-24 14:42:13 -04:00
Marc Delisle
ac65210a28 Typo in input field name 2013-04-24 14:41:57 -04:00
Kasun Chathuranga
edbe925d8a Minimize code duplication by pushing most of the common code to abstract parent class's setProperties() method 2013-04-19 23:00:22 +05:30
Kasun Chathuranga
175cb7b0ae Fix format specific options that were missing from ImportLdi plugin. Common code pulled out to AbstractImportCsv.class.php. 2013-04-18 22:44:49 +05:30
Kasun Chathuranga
4477494216 Importing CSV was also broken 2013-04-17 23:25:53 +05:30
Kasun Chathuranga
06655bf45d Fix bug #3879 Import broken for CSV using LOAD DATA 2013-04-17 23:25:16 +05:30
Michal Čihař
cf3b086e7e Various coding style improvements 2013-04-16 13:29:03 +02:00
Madhura Jayaratne
466a7645c7 PHP keywords must be lowercase 2013-04-12 21:45:02 +05:30
Marc Delisle
29b297f41f Fix bug "#3853 Blowfish implementation might be broken" by replacing the 
library with phpseclib

I could not make PMA_blowfish_test.php work with the new library.
 2013-04-01 07:04:25 -04:00
Marc Delisle
7b7abce116 Clarify the logic 2013-04-01 06:44:42 -04:00
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
f138f8b385 Fix fatal error in PHP 5.2 2013-02-08 07:09:49 -05:00
Michal Čihař
b3a317da78 bug #3519 [export] Prevent infinite recursion in PDF export. 2013-02-07 12:16:13 +01:00
Michal Čihař
22dfaaf622 bug #2951 [export] Correctly export decimal fields. 2013-02-07 11:49:43 +01:00
Dieter Adriaenssens
2683f32033 Temporary workaround for bug #3783 : 
Calling a method from a variable class is not possible before PHP 5.3.
 2013-02-06 16:56:01 +01:00
Gemorroj
fc51a91713 many some minor fixes (sorry, see diff) 2013-01-26 15:35:29 +03:00
Dieter Adriaenssens
688642560d use 'self' when calling static methods 2013-01-26 00:20:57 +01:00
Dieter Adriaenssens
f14aef2866 remove unused variables 2013-01-24 17:31:06 +01:00
Dieter Adriaenssens
87a70c8843 improve coding style 2013-01-21 13:37:45 +01:00
Michal Čihař
54b2540d87 Use ellipsis where appropriate 2013-01-10 13:33:29 +01:00
Michal Čihař
7207a4ebac Avoid double exporting of structure 
Debian bug #670734
 2013-01-09 12:58:51 +01:00
J.M
49771711fe After session expiry and re-login, bring user back to the page they were on. See issue #125 2012-12-27 19:33:48 +01:00
J.M
18d2463b41 Show login link in error message on cookie or session expiry 2012-12-27 16:06:09 +01:00
Marc Delisle
95fa48fc8e Remove remaining code in tbl_alter.php 2012-12-18 15:44:39 -05:00
Rouslan Placella
f730b7745d Improve response for failed http login 2012-11-26 23:08:15 +00:00
Rouslan Placella
bc9e81aa14 Fixed broken logout functionality got http auth 2012-11-26 22:56:37 +00:00
Michal Čihař
61a601fc73 Implement linking to new documentation 2012-11-12 09:48:05 +01:00