Commit Graph

76892 Commits

Author SHA1 Message Date
Michal Čihař
6a4ac7ef32 Do not emit headers when running testsuite 2012-06-25 12:17:33 +02:00
Michal Čihař
ad824a9232 The sql_query can be unset 2012-06-25 12:16:51 +02:00
Michal Čihař
14d2a27b8f Prepare config as test uses it 2012-06-25 11:13:01 +02:00
Michal Čihař
f010626290 Use require_once because of testsuite 2012-06-25 11:10:40 +02:00
Michal Čihař
913dd208a0 Include core before libraries which use it 2012-06-25 11:10:22 +02:00
Michal Čihař
0268a0b7c9 Include vendor config before scripts which use it 2012-06-25 11:09:11 +02:00
Michal Čihař
a872d67492 Merge pull request #75 from mynetx/php54upload
Another try to fix PHP 5.4-based upload progress
2012-06-25 02:04:15 -07:00
Michal Čihař
bbd221491b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-06-25 08:00:49 +02:00
Michal Čihař
020be99ad8 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-25 08:00:37 +02:00
Madhura Jayaratne
3bd1600ba9 Translated using Weblate. 2012-06-25 07:59:55 +02:00
J. M
c3f83cb7b1 Translated using Weblate. 2012-06-25 07:59:53 +02:00
Madhura Jayaratne
6587447716 Translated using Weblate. 2012-06-25 07:59:41 +02:00
J. M
b011120cca Translated using Weblate. 2012-06-25 07:59:40 +02:00
Jukka Penttinen
81f8b436e6 Translated using Weblate. 2012-06-25 07:59:40 +02:00
J.M
ed8e998307 Remove check for cURL support in PHP 5.4 upload progress handler, we dont need it anymore 2012-06-24 21:08:54 +02:00
J.M
4c7c3a31a5 Another try to fix PHP 5.4-based upload progress 2012-06-24 21:01:36 +02:00
Michal Čihař
a50f00962c Merge remote-tracking branch 'origin/master' 2012-06-24 13:25:09 +02:00
Marc Delisle
948f5c31cf Sometimes the row count was not correct 2012-06-24 07:19:26 -04:00
Michal Čihař
b444c69f41 Merge remote-tracking branch 'origin/master' 2012-06-24 12:54:35 +02:00
Madhura Jayaratne
ae75f78408 Translated using Weblate. 2012-06-24 12:54:22 +02:00
Marc Delisle
f43760aaee Unused code 2012-06-24 06:53:56 -04:00
Michal Čihař
bdc1227c2a Merge remote-tracking branch 'origin/master' 2012-06-24 07:00:40 +02:00
Jukka Penttinen
a9b39d3b87 Translated using Weblate. 2012-06-24 07:00:22 +02:00
Madhura Jayaratne
e182f2370b Coding style fixes 2012-06-24 10:27:05 +05:30
Madhura Jayaratne
6689049b35 bug #3535015 [navi] DbFilter, TableFilter clear buttons hidden on Chrome 2012-06-24 10:26:24 +05:30
Madhura Jayaratne
ec046f7d11 Use camel case for function names (PMA_query_as_controluser => PMA_queryAsControlUser) 2012-06-23 23:06:29 +05:30
Madhura Jayaratne
f5ed603c36 Use camel case for function names - another instance 2012-06-23 22:59:08 +05:30
Madhura Jayaratne
a79cbc51e8 Use camel case for function names 2012-06-23 22:52:29 +05:30
Madhura Jayaratne
74ef192c72 Specify return type 2012-06-23 22:50:00 +05:30
Madhura Jayaratne
1723f46b6f Wrap a long line 2012-06-23 22:46:59 +05:30
Madhura Jayaratne
59a9dd45f8 Use @return void instead of @return nothing 2012-06-23 22:45:41 +05:30
Madhura Jayaratne
a7bc7c254a @param tags should come right after the function description 2012-06-23 22:44:02 +05:30
Madhura Jayaratne
b3fda23c77 More coding style fixes 2012-06-23 22:41:49 +05:30
Madhura Jayaratne
a8dc1ed3d4 Wrap a long line 2012-06-23 22:17:32 +05:30
Madhura Jayaratne
6fdf3a9243 Class names should start with capital letters 2012-06-23 22:12:51 +05:30
Madhura Jayaratne
c150a4d31c Coding style fixes 2012-06-23 21:48:58 +05:30
Madhura Jayaratne
7135fe75e0 Fix coding style errors 2012-06-23 21:36:18 +05:30
Madhura Jayaratne
8284f22d54 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
	libraries/insert_edit.lib.php
2012-06-23 21:16:30 +05:30
Madhura Jayaratne
f5329f23e0 Coding style improvements (wrap some long lines, fix indentation, remove trailing spaces) 2012-06-23 21:02:19 +05:30
Thilina Buddika
7957602212 add the missing parameters in the PMA_getPmaTypeEnum function's docblock 2012-06-23 19:27:37 +05:30
Thilina Buddika
e49bcc8584 insclude missing code in insert_edit-lib 2012-06-23 19:19:08 +05:30
Thilina Buddika
f999925313 merge upstream 2012-06-22 22:19:56 +05:30
Thilina Buddika
11776f7f11 fixed - Inserting-editing ENUM columns impossible - ID-3536333 2012-06-22 21:54:05 +05:30
ProUser
9d2a8ca65c Translated using Weblate. 2012-06-22 13:11:37 +02:00
Michal Čihař
f4d1eed004 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-22 10:26:40 +02:00
Hyun-Sung Yun
c779b1ff10 Translated using Weblate. 2012-06-22 10:24:57 +02:00
Hyun-Sung Yun
61bf6575ec Translated using Weblate. 2012-06-22 10:24:44 +02:00
Michal Čihař
906d025d1f Merge remote-tracking branch 'origin/master' 2012-06-21 13:27:31 +02:00
Michal Čihař
64b19b0181 Wrap some long lines 2012-06-21 13:27:19 +02:00
Michal Čihař
82fc0ff49f Some indenation fixes 2012-06-21 13:27:19 +02:00