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

93396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Marc Delisle
ebd19293c6 Merge pull request #1233 from smita786/gsoc_central_columns_list 
add user defined column to central list
 2014-06-17 14:09:29 -04:00
Smita Kumari
e373a5a029 add user defined column to central list 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

using functions from tbl_columns_definition_form.lib.php to create the add column form

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix Coding styl

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added unit test for new function PMA_getHTMLforAddNewColumn

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

bug fix: added function to get columns count in central list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

using functions from tbl_columns_definition_form.lib.php to edit columns in central list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

improved test

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Bug/coding style fix

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

Fix delete issue

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added missing doc element

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-06-17 22:45:23 +05:30
Marc Delisle
6fe2d90bb5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-06-17 12:58:08 -04:00
Marc Delisle
a99eba5674 Dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-17 12:57:55 -04:00
Weblate
65de55506c Merge remote-tracking branch 'origin/master' 2014-06-17 18:52:01 +02:00
Rui Ralha
fabe95a315 Translated using Weblate (Portuguese) 
Currently translated at 62.8% (1765 of 2807)
 2014-06-17 18:51:58 +02:00
cherbib mehdi
d85760b8ca Translated using Weblate (Arabic) 
Currently translated at 40.4% (1136 of 2807)
 2014-06-17 18:51:56 +02:00
Marc Delisle
65fd429e3c Dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-17 12:51:44 -04:00
Dieter Adriaenssens
10e1978d92 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-17 14:24:14 +02:00
Dieter Adriaenssens
875df37df2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2770 of 2770)
 2014-06-17 14:21:00 +02:00
Marc Delisle
9fc815601a Unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 15:41:08 -04:00
Weblate
35a3ddbcd1 Merge remote-tracking branch 'origin/master' 2014-06-16 21:12:18 +02:00
Giovanni Sora
ece9e12a8d Translated using Weblate (Interlingua) 
Currently translated at 52.4% (1472 of 2807)
 2014-06-16 21:12:14 +02:00
Isaac Bennetch
5765c05cfe Merge pull request #1235 from D-storm/FR-755 
rfe-755: Export with table/column name changes
 2014-06-16 15:12:12 -04:00
Chirayu Chiripal
3ea7d2b52d rfe-755: export with table/column name changes 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-16 22:41:50 +05:30
Marc Delisle
7b38fa7651 Merge pull request #1234 from ashutoshdhundhara/bug_4458 
Bug #4458: Preview doesn't work when adding a new column.
 2014-06-16 13:07:16 -04:00
Marc Delisle
d51893b0b7 Clarify parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 13:01:38 -04:00
Marc Delisle
a9bdbfed30 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-06-16 12:58:24 -04:00
Marc Delisle
8ea7d15c16 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 12:44:27 -04:00
Ashutosh Dhundhara
1204d23592 Bug #4458: Preview doesn't work when adding a new column. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-16 22:05:08 +05:30
Weblate
1a51ffa6be Merge remote-tracking branch 'origin/master' 2014-06-16 18:34:27 +02:00
Burak Yavuz
9f74248522 Translated using Weblate (Turkish) 
Currently translated at 99.9% (2806 of 2807)
 2014-06-16 18:34:24 +02:00
Michal Čihař
7de8efbccf Translated using Weblate (Czech) 
Currently translated at 99.1% (2783 of 2807)
 2014-06-16 18:34:20 +02:00
Marc Delisle
9b1a29131a Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-16 12:34:10 -04:00
Marc Delisle
21ef65d97e Translated using Weblate (French) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-16 18:18:49 +02:00
Domen
f67578a035 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-16 14:40:12 +02:00
Matías Bellone
c9be91827c Translated using Weblate (Spanish) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-16 13:48:37 +02:00