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

84198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
eddeb82fb6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-06-13 12:34:18 -04:00
Marc Delisle
3216740323 No longer need to confirm at the PHP level 2013-06-13 12:34:05 -04:00
Weblate
ebb640350c Merge remote-tracking branch 'origin/master' 2013-06-13 18:22:49 +02:00
Dadan Setia
e0f430856f Translated using Weblate (Indonesian) 
Currently translated at 72.4% (1938 of 2675)
 2013-06-13 18:22:34 +02:00
Marc Delisle
25a3a03e0c Merge pull request #415 from scnakandala/gsoc_2013 
Refactoring SQL executor
 2013-06-13 09:20:43 -07:00
Spun Nakandala
01a12cd253 error corrected 2013-06-13 20:28:29 +05:30
Spun Nakandala
a9fd9aae52 bookmark.lib.php corrected to use the new variable names in $_POST['bkm_fields'][..] 2013-06-13 19:35:10 +05:30
Marc Delisle
17536941ec Improve function name 2013-06-13 08:31:05 -04:00
Marc Delisle
abaca78516 Merge pull request #421 from xmujay/0609_monitor 
refactor server_status_monitor.php 1. split long functions 2. add server_status_monitor.lib.php
 2013-06-13 05:23:55 -07:00
Weblate
b1e8e9c233 Merge remote-tracking branch 'origin/master' 2013-06-13 13:09:14 +02:00
Muhammad Kamran
8fbf5eac29 Translated using Weblate (Urdu) 
Currently translated at 24.2% (646 of 2673)
 2013-06-13 13:08:55 +02:00
Michal Čihař
e34445c69b Merge pull request #422 from psi-4ward/searchClause_hotkey 
Added accesskey="q" to searchClause input field to quickly get focus
 2013-06-13 04:03:48 -07:00
Christoph Wiechert
e6e5873534 Added accesskey="q" to searchClause input field to quickly focus it per hotkey 2013-06-13 12:47:09 +02:00
xmujay
6acdec1aef rename the function to a meaningful name 2013-06-13 14:49:25 +08:00
Spun Nakandala
3fabd7728f $_POST['fields'][...] variables renamed such that they better reflect their intended purpose 2013-06-13 11:31:29 +05:30
xmujay
438c84178f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into 0609_monitor 2013-06-13 10:30:01 +08:00
Madhura Jayaratne
ca3c8a0383 Optional @test annotation for tests 2013-06-13 00:39:44 +05:30
Madhura Jayaratne
df657a2a2e Coding style fixes for new tests 2013-06-13 00:32:02 +05:30
Weblate
efc0b1fd3b Merge remote-tracking branch 'origin/master' 2013-06-12 20:37:32 +02:00
Domen
65f7f3eff5 Translated using Weblate (Slovenian) 
Currently translated at 99.9% (2671 of 2673)
 2013-06-12 20:37:28 +02:00
Madhura Jayaratne
53a4f78d63 Merge pull request #418 from ayushchd/unit_testing 
Unit tests for charset conversions
 2013-06-12 11:37:17 -07:00
Spun Nakandala
ca8d81b95c PMA_isDropDatabase($sql_query) method added to sqlparser.lib.php 2013-06-12 22:05:24 +05:30
Matías Bellone
3776935965 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-12 18:24:56 +02:00
Weblate
69033c3bc6 Merge remote-tracking branch 'origin/master' 2013-06-12 17:02:50 +02:00
Marc Delisle
f3a6270f5f Translated using Weblate (French) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-12 17:02:44 +02:00
Dieter Adriaenssens
2cf24c85b2 Translated using Weblate (Dutch) 
Currently translated at 99.7% (2666 of 2673)
 2013-06-12 17:02:39 +02:00
Rouslan Placella
93dd321437 JSlint fixes 2013-06-12 16:02:06 +01:00
Spun Nakandala
e32064bcd2 code for displaying confirm page removed. 2013-06-12 19:54:44 +05:30
ayushchd
5ab5cb0f94 Conflict resolve with DBIDummy Class 2013-06-12 18:01:52 +05:45
Spun Nakandala
9ef591e69e space added before elseif 2013-06-12 17:21:51 +05:30
ayushchd
817dd4e357 Comment added for test case 2013-06-12 17:17:37 +05:45
ayushchd
dd56dd2401 Mark test incomplete if runkit is missing 2013-06-12 17:06:48 +05:45
Michal Čihař
1c0840ceae Merge pull request #416 from adamgsoc2013/UT_transform 
add test for applyTransformation
 2013-06-12 04:02:57 -07:00
Marc Delisle
cca17c031d Merge branch 'QA_4_0' 2013-06-12 06:42:09 -04:00
Marc Delisle
f5d631dbf6 bug #3976 Number of pages 2013-06-12 06:40:20 -04:00
ayushchd
febc05dae0 Unit tests for charset conversions 
Added test cases for:

1. libraries/char*
2. libraries/iconv*
3. libraries/kanji*
 2013-06-12 16:14:09 +05:45
adamgsoc2013
64415ab4c1 add test for applyTransformation 2013-06-12 18:23:30 +08:00
Burak Yavuz
a3b03740b7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-12 11:51:57 +02:00
Michal Čihař
9bcf95f235 Remove extra parenthesis 2013-06-12 10:57:00 +02:00
Weblate
2ad76e2c23 Merge remote-tracking branch 'origin/master' 2013-06-12 10:50:48 +02:00
Michal Čihař
122b55b2e1 Translated using Weblate (Korean) 
Currently translated at 66.5% (1778 of 2675)
 2013-06-12 10:50:43 +02:00
Michal Čihař
c0dee80451 Translated using Weblate (Indonesian) 
Currently translated at 71.2% (1904 of 2675)
 2013-06-12 10:50:40 +02:00
Michal Čihař
311af4c7e0 Use apply for jshint call to avoid problems with spaces in path 2013-06-12 10:50:09 +02:00
Michal Čihař
f4736d054e Use ant for travis ci builds 
This allows us to share setup with jenkins
 2013-06-12 10:46:38 +02:00
Michal Čihař
23141a05bd Add PHP lint to build.xml 2013-06-12 10:46:38 +02:00
Kristjan Räts
e7069f86f8 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2673 of 2673)
 2013-06-12 10:03:17 +02:00
Michal Čihař
c987f2bcaa Update po files 2013-06-12 09:39:39 +02:00
Weblate
f7edd8564a Merge remote-tracking branch 'origin/master' 2013-06-12 09:38:28 +02:00
Michal Čihař
be47052c37 Translated using Weblate (Czech) 
Currently translated at 99.9% (2673 of 2675)
 2013-06-12 09:38:22 +02:00
Michal Čihař
fab879f924 Simplify reCaptcha configuration 
Once private and public keys are in place, it is enabled. I see no need
for per server setup.
 2013-06-12 09:38:10 +02:00