Commit Graph

130 Commits

Author SHA1 Message Date
Kasun Chathuranga
3ccfc6fe88 Fix indentation 2013-06-11 21:55:56 +05:30
Kasun Chathuranga
479d2c1847 Fix alignment of doc comments 2013-06-11 21:54:34 +05:30
Marc Delisle
24fc4f5d53 Merge branch 'QA_4_0' 2013-05-31 11:59:59 -04:00
Marc Delisle
af46efa5ed If a TIMESTAMP contains a NULL value, show it when inserting or editing 2013-05-31 11:24:00 -04:00
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Isaac Bennetch
dd2ca745b9 Fix unwanted trailing spacing 2013-05-16 09:46:15 -04:00
Isaac Bennetch
fcd891514e Manually merge ayusun-fr1410 2013-05-16 09:36:36 -04:00
Kasun Chathuranga
2f0d55b708 PMA_DBI_get_fields_meta --> PMA_DBI_getFieldsMeta 2013-05-04 08:43:23 +05:30
Kasun Chathuranga
63e0f33c4a PMA_DBI_affected_rows --> PMA_DBI_affectedRows 2013-05-04 08:41:55 +05:30
Kasun Chathuranga
c09aa36d84 PMA_DBI_insert_id --> PMA_DBI_insertId 2013-05-04 08:41:02 +05:30
Kasun Chathuranga
556bcb9f9d PMA_DBI_num_rows --> PMA_DBI_numRows 2013-05-04 08:39:43 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
5bcc32999f PMA_DBI_fetch_assoc --> PMA_DBI_fetchAssoc 2013-05-04 08:30:12 +05:30
Michal ฤŒihaล™
384f2cd79e Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	js/pmd/history.js
	libraries/Config.class.php
2013-05-02 10:13:18 +02:00
J.M
92d3dcad3c Fix typo in comments and function name ('foriegn' to 'foreign') 2013-05-01 17:13:53 +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
d210c2a8a7 PMA_DBI_get_warnings --> PMA_DBI_getWarnings 2013-05-01 00:06:37 +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
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
ayusun
c198f41e37 Implementation of feature request 1410. AES_ENCRYPT w/ Salt 2013-04-30 04:44:26 +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
Chanaka Indrajith
c2fcb53fa6 Remove unnecessary codes for Inline Edit functionality 2013-02-18 22:11:19 +05:30
Chanaka Indrajith
32e3444d6d Inline Edit - Fetch the values from db when possible, without render entered value as it is 2013-02-16 20:16:28 +05:30
Dieter Adriaenssens
ed94a77259 remove unused variables 2013-01-24 17:31:07 +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
df4c535d06 improve coding style 2013-01-15 20:36:14 +01:00
Chanaka Indrajith
baac672144 Resolve conflicts 2012-12-23 19:59:12 +05:30
Chanaka Indrajith
1ae30d2ba7 Move hasPrimaryKeyOrUniqueKey function to insert_edit.lib.php file 2012-12-23 18:24:29 +05:30
Marc Delisle
c12e915504 Function had been moved to PMA_Util 2012-11-28 13:06:55 -05:00
Marc Delisle
987ea70fbc Improve function name 2012-11-20 10:13:41 -05:00
Marc Delisle
354c5e9773 Remove vague function 2012-11-20 10:09:26 -05:00
Marc Delisle
174c9cc534 Incorrect order of parameters 2012-11-01 07:26:07 -04:00
Madhura Jayaratne
e1afee9e62 bug #3577443 [edit] "Browse foreign values" does not show on ajax edit 2012-10-18 23:15:10 +05:30
Dieter Adriaenssens
b7d2138fca various coding style fixes 2012-10-11 19:21:29 +02:00
Marc Delisle
feb7732133 Make transformations work using the new plugins system, when grid editing 2012-09-23 17:56:05 -04:00
Marc Delisle
b2ffb574a6 Incorrect function signature 2012-09-23 07:20:04 -04:00
Chanaka Indrajith
13208324d3 Removed unnecessary empty lines in functions 2012-09-19 00:15:15 +05:30
Chanaka Indrajith
36ffe5e0a3 Modified some untracked changes 2012-09-16 14:51:13 +05:30
Chanaka Indrajith
6971295e96 Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util:: 2012-09-16 14:41:47 +05:30
Chanaka Indrajith
e6894be57f Renamed ->method() with PMA_Util::method() 2012-09-16 14:35:45 +05:30
Chanaka Indrajith
0829709064 Remove variable 2012-09-16 14:31:22 +05:30
Dieter Adriaenssens
f1a90f78b1 coding style : fix indenting 2012-08-31 14:51:04 +02:00
Marc Delisle
0246a2b624 Fix undefined function 2012-08-24 08:04:12 -04:00
Marc Delisle
9a5bc69340 Bug #3538524 "Edit next" does not work 2012-08-24 07:45:53 -04:00
Madhura Jayaratne
60d0c8a132 No need to pass $found_unique_key through all these functions 2012-07-12 06:33:42 +05:30
Madhura Jayaratne
5653849494 Coding style fixes 2012-07-11 20:55:50 +05:30
Madhura Jayaratne
9260e7685d Coding style fixes 2012-07-11 14:19:11 +05:30