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

93425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ann + J.M
d18a2dd9fa Fix XSS in PMA_RecentFavoriteTable::getHtmlList() 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-06-19 12:52:52 +02:00
Marc Delisle
ee412e6cdb Merge commit '1b56db7' 2014-06-18 12:08:50 -04:00
Marc Delisle
da7fe3a137 Merge commit '9ca3784' 2014-06-18 12:06:53 -04:00
Weblate
c01de87ef6 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-06-18 18:06:11 +02:00
Rui Ralha
8b93864670 Translated using Weblate (Portuguese) 
Currently translated at 63.2% (1751 of 2770)
 2014-06-18 18:06:08 +02:00
Giovanni Sora
7b2d66f08c Translated using Weblate (Interlingua) 
Currently translated at 52.0% (1441 of 2770)
 2014-06-18 18:06:06 +02:00
cherbib mehdi
eeed348ddc Translated using Weblate (Arabic) 
Currently translated at 41.0% (1138 of 2770)
 2014-06-18 18:06:04 +02:00
Marc Delisle
1b56db7daf Merge pull request #1231 from D-storm/sql_views 
fix: sql export views as tables getting ignored
 2014-06-18 12:05:53 -04:00
Weblate
d1f4b2d70e Merge remote-tracking branch 'origin/master' 2014-06-18 16:21:04 +02:00
Dieter Adriaenssens
53a83e6886 Translated using Weblate (Portuguese) 
Currently translated at 62.8% (1765 of 2807)
 2014-06-18 16:21:01 +02:00
Dieter Adriaenssens
942922b150 Translated using Weblate (German) 
Currently translated at 92.5% (2597 of 2807)
 2014-06-18 16:20:58 +02:00
Isaac Bennetch
fce3f58d23 Merge pull request #1236 from D-storm/iFR-755 
export with table/column names changes extended for other export formats
 2014-06-18 10:20:55 -04:00
Chirayu Chiripal
a78a7a0c9c export with table/column names changes extended for other export formats 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-18 16:09:57 +05:30
Bimal Yashodha
e2af75781f Fix id of the input 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:53:09 +05:30
Bimal Yashodha
a7814b39ba Pass $db as a parameter 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:48:38 +05:30
Bimal Yashodha
53bea7bb22 Duplicate code 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:40:45 +05:30
Bimal Yashodha
56494730a4 Improve queries 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 08:11:04 +05:30
Bimal Yashodha
c8e375defc Indent properly 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 07:59:14 +05:30
Bimal Yashodha
85cf1b92d3 Better variable name 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 07:51:55 +05:30
Bimal Yashodha
3f39847e1b Remove unused function 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-18 07:50:03 +05:30