Commit Graph

225 Commits

Author SHA1 Message Date
Michal Čihař
00607e6041 Whitespace cleanup
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-08 11:19:12 +01:00
Michal Čihař
3d230b6ab7 Avoid infinite recursion on goto
Signed-off-by: Michal Čihař <michal@cihar.com>
2016-12-08 11:18:51 +01:00
Umair Khan
576008a72f Typo Fix in comment 2013-10-29 23:33:00 +05:30
Chanaka Indrajith
c2fcb53fa6 Remove unnecessary codes for Inline Edit functionality 2013-02-18 22:11:19 +05:30
Chanaka Indrajith
baac672144 Resolve conflicts 2012-12-23 19:59:12 +05:30
Chanaka Indrajith
b16a6afeb6 Introduce new function for check truncatable values 2012-12-23 19:48:15 +05:30
Chanaka Indrajith
1ae30d2ba7 Move hasPrimaryKeyOrUniqueKey function to insert_edit.lib.php file 2012-12-23 18:24:29 +05:30
Chanaka Indrajith
bd0b51bc17 Change the way of calling backquote function 2012-12-23 17:32:25 +05:30
Chanaka Indrajith
9633fafbdf Merge branch 'QA_3_5' 2012-12-23 16:51:16 +05:30
Chanaka Indrajith
0cc8121846 Extend support for inline edit, smallint fields 2012-12-23 16:45:35 +05:30
Marc Delisle
a1fdfe1a03 Bug #3583313 Selecting an action to do after inserting a row does nothing 2012-11-19 13:00:59 -05:00
Rouslan Placella
6b7d88734a Merge branch 'QA_3_5'
Conflicts:
	po/pt_BR.po
	tbl_replace.php
2012-11-11 20:07:24 +00:00
J.M
b98cdae9e7 Fix bug #3585523 [interface] Inline query editing broken after row update 2012-11-11 17:43:56 +01:00
Madhura Jayaratne
48354457a8 Merge branch 'QA_3_5' 2012-09-24 22:02:18 +05:30
Madhura Jayaratne
3fe7816596 bug #3570212 [edit] uuid_short() is a no-arguments function 2012-09-24 21:39:39 +05:30
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
Marc Delisle
7a32ea9def Possibility of undefined variable here 2012-09-23 07:16:30 -04:00
Marc Delisle
7f38ab21d3 Refactoring lost during merge 2012-09-23 07:12:38 -04:00
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
Madhura Jayaratne
2095bc3211 Wrap some long lines 2012-09-05 22:13:55 +05:30
Madhura Jayaratne
78c36808e5 Fix method names 2012-08-30 23:17:25 +05:30
Madhura Jayaratne
5e13ef8295 Merge branch 'QA_3_5'
Conflicts:
	po/de.po
	po/pt_BR.po
	po/sl.po
	po/th.po
2012-08-26 19:59:26 +05:30
Madhura Jayaratne
cd1b311543 bug #3559955 [edit] current_date from function drop down fails on update 2012-08-26 19:54:56 +05:30
Chanaka Indrajith
e5a4596de7 Merge remote branch 'upstream/master' 2012-07-01 09:08:37 +05:30
Marc Delisle
2c6f80aa47 Bug #3539142 Normal INSERT does not show the statement 2012-06-30 15:00:15 -04:00
Chanaka Indrajith
106265a7f8 Resolve conflicts 2012-06-30 11:30:39 +05:30
Alex Marin
3fa180b228 oop: merge master, fix commits 2012-06-27 19:52:37 +03:00
Chanaka Indrajith
39d37fafcc Resolved conflicts 2012-06-27 21:53:59 +05:30
Chanaka Indrajith
1cc49d32d9 Resolved conflicts 2012-06-27 07:06:34 +05:30
Madhura Jayaratne
c150a4d31c Coding style fixes 2012-06-23 21:48:58 +05:30
Chanaka Indrajith
766466135e Implement class behavior of common.lib.php file 2012-06-22 23:38:33 +05:30
Thilina Buddika
f999925313 merge upstream 2012-06-22 22:19:56 +05:30
Alex Marin
b0248d0e4d oop: fix transformations bug 2012-06-20 20:44:28 +03:00
Alex Marin
11596ca702 oop: merge master, fix conflicts 2012-06-20 18:35:00 +03:00
Alex Marin
02dbd14fc7 oop: integrate transformations - no errors, but not working. 2012-06-20 16:28:10 +03:00
Madhura Jayaratne
c84ec82994 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-19 21:16:02 +05:30
Thilina Buddika
66a2709334 some formating and correct wrong requre_onece in tbl_replace 2012-06-18 08:37:51 +05:30
Thilina Buddika
563f8628f6 impllemented a function to replace tbl_replace_fileds-inc 2012-06-17 14:43:36 +05:30
Thilina Buddika
c1e3fb7b16 print html using addHTML function in tbl-change 2012-06-17 00:11:10 +05:30
Thilina Buddika
c48e274802 change the code for detecting ajax request 2012-06-16 23:35:25 +05:30
Thilina Buddika
e9aa768ed2 change some functions signatures 2012-06-16 19:14:22 +05:30
Thilina Buddika
da9509dac0 code improvement 2012-06-16 17:46:27 +05:30
Thilina Buddika
fa2bcbc5e6 correct wrong function signature 2012-06-16 10:56:47 +05:30
Thilina Buddika
beb526cefa remove warning messages 2012-06-16 10:28:44 +05:30
Thilina Buddika
7a7a18fd0e remove warning messages 2012-06-16 10:17:51 +05:30
Madhura Jayaratne
15a436de74 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-14 06:18:24 +05:30
Chanaka Indrajith
253de23cf3 Resolved conflicts 2012-06-14 00:52:06 +05:30
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00