gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,445 Commits 12 Branches 481 Tags 2.4 GiB
8be6ce78aa
Commit Graph

93445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
8be6ce78aa Merge remote-tracking branch 'origin/master' 2014-06-22 20:53:34 +02:00
Sevdimali İsa
5a98093895 Translated using Weblate (Azerbaijani) 
Currently translated at 35.8% (1006 of 2807)
 2014-06-22 20:53:30 +02:00
Marc Delisle
c5904557e3 Merge pull request #1242 from ashutoshdhundhara/rfe_869 
RFE#869: Run SQL query: Allow rollback for InnoDB tables.
 2014-06-22 14:53:29 -04:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables. 
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-22 22:41:23 +05:30
Hugues Peccatte
f0368f0100 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-22 17:01:58 +02:00
Hugues Peccatte
6e118dadea Merge pull request #1244 from Tithugues/QA_4_2_fixEmptySQL 
Fix error when clicking 'Go' and having an empty textarea in SQL tab. (bug #4470)
 2014-06-22 16:48:15 +02:00
Weblate
6bb4145505 Merge remote-tracking branch 'origin/master' 2014-06-22 16:39:07 +02:00
Yungu Kim
287b594abf Translated using Weblate (Korean) 
Currently translated at 81.6% (2291 of 2807)
 2014-06-22 16:39:03 +02:00
Hugues Peccatte
09a8a40300 Merge pull request #1240 from Tithugues/scrutinizer 
Fix some Scrutinizer issues
 2014-06-22 16:38:59 +02:00
Weblate
c3829a8f53 Merge remote-tracking branch 'origin/master' 2014-06-22 13:26:18 +02:00
Sevdimali İsa
f30ff8fd01 Translated using Weblate (Azerbaijani) 
Currently translated at 30.0% (844 of 2807)
 2014-06-22 13:26:15 +02:00
Marc Delisle
270eb32ee6 Merge pull request #1245 from ashutoshdhundhara/bug_security 
Bug: Escape table name.
 2014-06-22 07:26:11 -04:00
Weblate
b2cb6161df Merge remote-tracking branch 'origin/master' 2014-06-21 18:58:45 +02:00
Richard G. Nielsen
7f747fc6b3 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.6% (1703 of 2807)
 2014-06-21 18:58:42 +02:00
Sevdimali İsa
b457d77b8c Translated using Weblate (Azerbaijani) 
Currently translated at 19.7% (553 of 2807)
 2014-06-21 18:58:40 +02:00
Marc Delisle
290547e980 Freecode.com is now read-only 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-21 12:57:59 -04:00
Marc Delisle
cf13eb2583 Merge branch 'QA_4_2' 2014-06-21 07:23:14 -04:00
Marc Delisle
da732cc88b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-21 07:22:36 -04:00
Ashutosh Dhundhara
3b24737d14 Bug: Escape table name. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-21 09:15:45 +05:30
Hugues Peccatte
876d029549 Fix error when clicking 'Go' and having an empty textarea in SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-20 23:22:42 +02:00
Marc Delisle
67a705b053 Merge branch 'QA_4_2' 2014-06-20 15:41:05 -04:00
Marc Delisle
a30405fe0b bug #4467 shell_exec() has been disabled for security reasons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 15:39:09 -04:00
Madhura Jayaratne
5697fecf81 Merge pull request #1241 from kb-yashodha/ut 
Unit tests
 2014-06-20 22:49:36 +05:30
Bimal Yashodha
0bd6b5bf89 Resolve issues reported by Scrutinizer 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-20 22:26:36 +05:30
Marc Delisle
88007a20bc Merge branch 'QA_4_2' 2014-06-20 12:53:08 -04:00
Marc Delisle
0ffa3766d1 Merge commit 'aea604f' 2014-06-20 12:53:00 -04:00
Marc Delisle
f1253cf31f 4.2.4 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:52:26 -04:00
Marc Delisle
9f37c3ddd7 Fix merge conflits 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:44:51 -04:00
Marc Delisle
aea604f850 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 12:40:11 -04:00
Marc Delisle
782fe7a1e5 Merge commit 'd4f754c' into QA_4_2 2014-06-20 12:38:43 -04:00
Marc Delisle
85cc97b3fa 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:48:53 -04:00
Marc Delisle
0e9dda8259 Merge commit 'aebfcfd' 2014-06-20 08:48:27 -04:00
Marc Delisle
aebfcfdc9f 4.2.5-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-20 08:47:51 -04:00
Hugues Peccatte
66f82fbfac Update PHPDoc and remove useless variables and methods to fix scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 22:09:18 +02:00
Hugues Peccatte
40def1a7a2 Fix 'function declaration in loop' scrutinizer errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-06-19 21:42:59 +02:00
Bimal Yashodha
6b52d4c68d Test for PMA_getFirstPage 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-20 00:40:15 +05:30
Bimal Yashodha
f470b2fbc3 Test for PMA_getPageName() 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-20 00:24:24 +05:30
Bimal Yashodha
6f7040f809 Tests for PMA_getHtmlForPageSaveAs() 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-20 00:12:26 +05:30
Bimal Yashodha
6e6090cf82 Tests for PMA_getHtmlForPageSaveAs() 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-19 23:39:07 +05:30
Bimal Yashodha
685f6dcc77 Unit tests for PMA_getPageIdsAndNames() and PMA_getHtmlForEditOrDeletePages() 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-19 23:26:58 +05:30
Isaac Bennetch
ff913e2855 Merge pull request #1238 from D-storm/export-back-link 
fix: error in export with option view output as text
 2014-06-19 12:51:08 -04:00
Isaac Bennetch
30de95fc0a Merge pull request #1239 from D-storm/scrutinizer 
scrutinizer issues fix
 2014-06-19 12:45:42 -04:00
Marc Delisle
30c237754b Clarify the meaning of a variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-19 12:17:41 -04:00
Marc Delisle
fb4387c136 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-19 12:06:53 -04:00
Marc Delisle
0fed3cf40e Merge pull request #1237 from ashutoshdhundhara/simulate_query 
RFE#861: Simulate UPDATE queries.
 2014-06-19 12:00:49 -04:00
Ashutosh Dhundhara
8a46508bd0 RFE#861: Simulate UPDATE queries. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Show 'Simulate query' button only in case of UPDATE and DELETE.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix code style.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-19 21:16:13 +05:30
Ann + J.M
c68ed5c51b Add Changelog section for 4.2.4.0, list bugs 4464, 4465 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 15:26:40 +02:00
Chirayu Chiripal
1dd8d8c28c fix: error in export with option view output as text 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:30:50 +05:30
Chirayu Chiripal
c8a6ea0467 scrutinizer issues fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-19 17:10:55 +05:30
Ann + J.M
d4f754c937 Fix XSS in Hide navigation items feature 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 12:57:59 +02:00