Commit Graph

79832 Commits

Author SHA1 Message Date
Marc Delisle
3da06649c9 Missing dummy queries 2012-11-04 09:42:19 -05:00
Marc Delisle
42f328cd6a Missing vim modeline 2012-11-04 09:38:23 -05:00
Marc Delisle
d1ca3e069e Merge pull request #100 from roccivic/missing-ajax-object
Fixed bug #3583240 - /setup: AJAX is not defined
2012-11-04 05:50:10 -08:00
Rouslan Placella
d9a6e77864 Fixed bug #3583240 - /setup: AJAX is not defined 2012-11-04 13:07:07 +00:00
Matías Bellone
66bcad9bbd Translated using Weblate. 2012-11-03 15:53:26 +01:00
Burak Yavuz
4cc605d522 Translated using Weblate. 2012-11-03 15:23:11 +01:00
Panagiotis Papazoglou
dee3176aec Translated using Weblate. 2012-11-03 14:43:08 +01:00
Marc Delisle
b4477ded2e Translated using Weblate. 2012-11-03 14:23:50 +01:00
Domen
de8f978d04 Translated using Weblate. 2012-11-03 13:52:16 +01:00
Marc Delisle
3c5f4b021b Update po files 2012-11-03 07:36:24 -04:00
Marc Delisle
824c2804a7 Add the from-code option to xgettext, otherwise it fails on the new ellipsis character 2012-11-03 07:35:55 -04:00
Marc Delisle
5bd7678e09 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-11-03 07:30:34 -04:00
Marc Delisle
91a4ca445d Replace "frame" with "panel" and "left" with "navi" or "navigation" 2012-11-03 07:27:17 -04:00
Rouslan Placella
43abd11868 Fixed footer test broken in 4a149570c3 2012-11-03 11:22:06 +00:00
Rouslan Placella
11298ea2b5 Fixed DisplayResults test case 2012-11-03 11:18:47 +00:00
Marc Delisle
0a30c682dc Vim modeline was missing 2012-11-03 06:53:01 -04:00
Marc Delisle
4a149570c3 Bug #3582706 DBG SQL and frames removal 2012-11-03 06:51:58 -04:00
Madhura Jayaratne
6ab74e8790 Merge branch 'QA_3_5'
Conflicts:
	po/tr.po
2012-11-03 09:54:17 +05:30
Madhura Jayaratne
8ffd849401 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2012-11-03 09:52:36 +05:30
Madhura Jayaratne
3fef7c794d Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-11-03 09:37:04 +05:30
Weblate
4f50bdbebe Merge remote-tracking branch 'origin/master' 2012-11-02 18:08:38 +01:00
Burak Yavuz
981a9161c2 Translated using Weblate. 2012-11-02 18:08:33 +01:00
Marc Delisle
06f5d2150d debug_backtrace() does not always return the file and line portions 2012-11-02 13:07:56 -04:00
Marc Delisle
c52dc0d2b7 Improve comments 2012-11-02 06:53:09 -04:00
Michal Čihař
974867749e Remove duplicate strings 2012-11-02 09:26:55 +01:00
Rouslan Placella
f1b2bc3bc5 Fixed bug #3582541 - Error on addfield 2012-11-01 19:35:08 +00:00
Rouslan Placella
5d38f64936 Revert 5721fb7620, it segfaults the testsuite
This reverts commit 5721fb7620.
2012-11-01 19:21:05 +00:00
Rouslan Placella
5721fb7620 Fixed "footer display" test case 2012-11-01 19:11:25 +00:00
Weblate
3b62a6387d Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2012-11-01 20:03:58 +01:00
Burak Yavuz
eb0b010b37 Translated using Weblate. 2012-11-01 20:03:55 +01:00
Weblate
d052edfe8d Merge remote-tracking branch 'origin/master' 2012-11-01 20:03:54 +01:00
Israel Torres
0398272886 Translated using Weblate. 2012-11-01 20:03:52 +01:00
Panagiotis Papazoglou
9e1cc35a64 Translated using Weblate. 2012-11-01 20:03:51 +01:00
Chanaka Indrajith
8ef780facd Resolve conflicts 2012-11-02 00:33:18 +05:30
Chanaka Indrajith
c2d95b2229 Resolve conflicts 2012-11-02 00:31:36 +05:30
Madhura Jayaratne
95860024e5 Simplify the code 2012-11-02 00:22:19 +05:30
Panagiotis Papazoglou
5ec45dd5ca Translated using Weblate. 2012-11-01 19:44:51 +01:00
Chanaka Indrajith
393eb3ec20 Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 2012-11-02 00:00:19 +05:30
Madhura Jayaratne
5c83a56512 Merge branch 'QA_3_5'
Conflicts:
	tbl_select.php
2012-11-01 23:52:19 +05:30
Weblate
3b8029bc8f Merge remote-tracking branch 'origin/master' 2012-11-01 18:58:22 +01:00
Israel Torres
8eac97888b Translated using Weblate. 2012-11-01 18:58:18 +01:00
Chanaka Indrajith
e78bde8978 Merge branch 'QA_3_5' 2012-11-01 23:27:51 +05:30
Chanaka Indrajith
6dba4654e4 Fix typo 2012-11-01 23:27:14 +05:30
Chanaka Indrajith
6b0e058896 Generate correct SQL when export set of resulted rows 2012-11-01 23:19:29 +05:30
Chanaka Indrajith
8831f48c4f Merge branch 'MAINT_3_5_3' into QA_3_5 2012-11-01 23:12:48 +05:30
Chanaka Indrajith
d93f410fe4 Revert commit 5b820cf changes in MAINT_3_5_3 2012-11-01 23:09:16 +05:30
Madhura Jayaratne
1559249688 Fix undefined variable warnings 2012-11-01 22:44:10 +05:30
André Luiz Girol
5a313983a9 Translated using Weblate. 2012-11-01 16:52:25 +01:00
Rouslan Placella
843b21b300 Fixed dbsearch test case 2012-11-01 13:34:28 +00:00
Rouslan Placella
afbb6cacbc Fixed fatal errors in DisplayResults test cases 2012-11-01 13:27:06 +00:00