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

93369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Kristjan Räts
41785d0bb8 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-16 13:20:26 +02:00
Panagiotis Papazoglou
461d438d63 Translated using Weblate (Greek) 
Currently translated at 100.0% (2807 of 2807)
 2014-06-16 13:13:10 +02:00
Madhura Jayaratne
521a77d8bd Merge pull request #1232 from kb-yashodha/multipages1 
Complete multipages functionality in designer
 2014-06-16 15:22:13 +05:30
Michal Čihař
fc7adbaa37 Update po files 2014-06-16 11:16:02 +02:00
Michal Čihař
e4cd090611 Improve some messags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-16 11:15:02 +02:00
Michal Čihař
d78e41d737 Merge pull request #1219 from dhananjay92/dhananjay-gsoc-rebased 
Commits for review: Add php Error Reporting Functionality to PMA (Rebased)
 2014-06-16 11:11:13 +02:00
Weblate
57a61ab049 Merge remote-tracking branch 'origin/master' 2014-06-16 10:55:06 +02:00
Anders Jonsson
c1737d824c Translated using Weblate (Swedish) 
Currently translated at 98.8% (2769 of 2802)
 2014-06-16 10:55:03 +02:00
Michal Čihař
5600a8090f Merge pull request #1226 from WhaleWatching/update_cm 
Update codemirror, because cursor in old version had a wrong position.
 2014-06-16 10:54:59 +02:00
Bimal Yashodha
03b4e522e3 Close the dialog 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 13:05:38 +05:30
Bimal Yashodha
2180f08135 Fix tests 
Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>
 2014-06-16 12:34:25 +05:30
Kristjan Räts
626c1ecb4e Translated using Weblate (Estonian) 
Currently translated at 100.0% (2802 of 2802)
 2014-06-16 08:31:47 +02:00
Dhananjay Nakrani
83d63d23ea Fix coding style issues. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
e65b678386 Add test cases for'PMA_Error::getBacktrace()'. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
68de01a99e Minor Interface improvements. Scroll down & show 'working' icon. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
8b09aa7f76 Make Syntax compatible with php-5.3 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
c00d1d5ef6 Change hardcoded indexing to dynamic one. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
627873f146 Enable 'Send error reports automatically next time' option in php error reporting form. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:55 +05:30
Dhananjay Nakrani
b621ab9277 Merge paths for 'php'& 'js' error reporting. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
bfef3e80df Remove unnecessarily added empty lines. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
b2e3164441 Make return values of PMA_getReportData() consistent. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
caaacefcbe Move inline JS to 'binded' JS. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
bc76f04ce7 Remove trailing whitespaces. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
30d1a03ab6 Rename function to a sensible name. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
d01323886b Display error automatically being submitted message in non-AJAX case too. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30
Dhananjay Nakrani
006f041c07 Stop one more 'false alarm', case of non-AJAX request. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-06-16 11:50:54 +05:30