Commit Graph

76922 Commits

Author SHA1 Message Date
Marc Delisle
90304f4437 Merge branch 'atul' 2012-06-26 10:13:45 -04:00
Marc Delisle
e267d74f6d 3.5.3-dev 2012-06-26 07:35:15 -04:00
Marc Delisle
59cd263393 Merge branch 'QA_3_5' 2012-06-26 07:34:15 -04:00
Marc Delisle
ef15437ac4 3.5.3-dev 2012-06-26 07:33:55 -04:00
Michal Čihař
dd32b162f5 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-26 13:18:39 +02:00
Aputsiaq Niels Janussen
a59f8d1870 Translated using Weblate. 2012-06-26 13:16:48 +02:00
Aputsiaq Niels Janussen
206c2b9db3 Translated using Weblate. 2012-06-26 13:16:34 +02:00
Atul Pratap Singh
bcd4a8c20d Use new way of generating content in db_search.php 2012-06-26 02:24:37 +05:30
Atul Pratap Singh
46a4b693d4 Slice PMA_dbSearchGetResultsRow out of PMA_dbSearchGetSearchResults 2012-06-26 02:01:00 +05:30
Atul Pratap Singh
98c8b308b8 Fix typo in doc comments 2012-06-26 00:26:51 +05:30
Atul Pratap Singh
5a7952eca2 Merge remote-tracking branch 'upstream/master' 2012-06-26 00:02:11 +05:30
Atul Pratap Singh
0435de02c7 Form function for displaying search results 2012-06-26 00:00:29 +05:30
J.M
fea07f0a0e ajax_request might not be set in tbl_operations 2012-06-25 16:27:08 +02:00
Michal Čihař
691fae14fe Mark private attributes as private 2012-06-25 14:51:42 +02:00
Michal Čihař
479e4909cb Wrap some long lines 2012-06-25 14:51:04 +02:00
Michal Čihař
7c1edb1586 Mark private attributes as private 2012-06-25 14:46:53 +02:00
Michal Čihař
600f4610d6 Merge remote-tracking branch 'origin/QA_3_5' 2012-06-25 14:40:03 +02:00
Gyu-sun Youm
b9c97929ec Translated using Weblate. 2012-06-25 14:37:27 +02:00
Michal Čihař
bb1bd5e518 Merge remote-tracking branch 'origin/master' 2012-06-25 13:52:48 +02:00
Marc Delisle
be434a8b05 The new "check all" checkbox should not be used to find a database name for dropping purposes 2012-06-25 07:52:19 -04:00
Michal Čihař
b1735dcecd Merge remote-tracking branch 'origin/master' 2012-06-25 13:20:47 +02:00
Marc Delisle
c25229c66d Merge pull request #74 from mynetx/checkall
Use checkbox for checking/unchecking all rows in a table
2012-06-25 04:20:39 -07:00
Michal Čihař
190a04ba1f Merge remote-tracking branch 'origin/master' 2012-06-25 12:18:11 +02:00
Michal Čihař
cacbc79bc8 Add missing variables and includes to make the test work 2012-06-25 12:17:50 +02:00
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ř
566e58e892 Merge remote-tracking branch 'origin/master' 2012-06-25 11:04:34 +02:00
Gyu-sun Youm
16c0d46f09 Translated using Weblate. 2012-06-25 11:04:20 +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
Atul Pratap Singh
c5ab423dee Merge remote-tracking branch 'upstream/master' 2012-06-25 06:59:02 +05:30
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
J.M
8eb0f2f22b Use checkbox for checking/unchecking all rows in a table 2012-06-24 17:49:53 +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