gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,559 Commits 12 Branches 481 Tags 2.4 GiB
181bd52169
Commit Graph

95559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ion Adrian-Ionut
181bd52169 Translated using Weblate (Romanian) 
Currently translated at 60.8% (1809 of 2973 strings)

[CI skip]
 2014-10-23 18:59:17 +02:00
Weblate
4b3f233581 Merge remote-tracking branch 'origin/master' 2014-10-23 13:46:26 +02:00
Dennis Jakobsen
7aabfffac2 Translated using Weblate (Danish) 
Currently translated at 96.5% (2871 of 2973 strings)

[CI skip]
 2014-10-23 13:46:25 +02:00
Marc Delisle
0f58673cee Merge pull request #1383 from smita786/master 
moving out inline js from db_designer.lib.php plus minor bug fixes
 2014-10-23 07:46:22 -04:00
Ann + J.M
5b5d50e471 Fix phpdoc errors 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 21:11:50 +02:00
Ann + J.M
953e865fc6 Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-10-22 20:44:50 +02:00
Chanaka Dharmarathna
b1b6232c04 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-22 23:08:13 +05:30
Smita Kumari
28622a4bcc fixing coding style 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-22 22:53:35 +05:30
Weblate
5f50dc9e8a Merge remote-tracking branch 'origin/master' 2014-10-22 18:41:18 +02:00
Eyal Visoker
b5d04d24c1 Translated using Weblate (Hebrew) 
Currently translated at 19.6% (584 of 2973 strings)

[CI skip]
 2014-10-22 18:41:17 +02:00
Marc Delisle
5df7783e97 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-22 12:41:06 -04:00
Smita Kumari
b4906839e4 remove trailing white spaces 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:45:32 +05:30
Smita Kumari
41eda0819a resolve conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 23:43:10 +05:30
Madhura Jayaratne
c678cc5bb0 Merge branch 'QA_4_2' 2014-10-21 22:27:13 +05:30
Madhura Jayaratne
1e21d7b0da bug #4568 Date displayed incorrectly when charting a timeline 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 22:24:44 +05:30
Madhura Jayaratne
35b228d534 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 22:03:10 +05:30
Madhura Jayaratne
e28912d49e bug #4557 PHP fatal error, undefined function __() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:59:46 +05:30
Madhura Jayaratne
3334ca3ce6 bug #4564 Designer: spaces in table name with edit table link generates bad links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:20:24 +05:30
Madhura Jayaratne
ef33a839fb Avoid accessing undefined indexes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 21:05:06 +05:30
Marc Delisle
387f6aa273 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-21 10:39:58 -04:00
Marc Delisle
b906e51112 Merge commit 'd8d4a80' 2014-10-21 10:39:43 -04:00
Marc Delisle
dde9ca7c79 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:38:46 -04:00
Michal Čihař
a00cc2b106 Translated using Weblate (Czech) 
Currently translated at 93.7% (2787 of 2973 strings)

[CI skip]
 2014-10-21 16:33:48 +02:00
Marc Delisle
1ca706fd1e Merge commit '319aac3' 2014-10-21 10:31:43 -04:00
Marc Delisle
83e3223524 Merge commit '8186a0e' 2014-10-21 10:31:29 -04:00
Weblate
a5516f3b34 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-21 16:31:12 +02:00
josep constanti
4e7fbc287c Translated using Weblate (Catalan) 
Currently translated at 88.3% (2446 of 2768 strings)

[CI skip]
 2014-10-21 16:31:10 +02:00
Marc Delisle
d8d4a8062a Merge commit 'd0e3ab3' into QA_4_2 2014-10-21 10:29:37 -04:00
Marc Delisle
873ffa3ffe Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:29:14 -04:00
Marc Delisle
b75e19f8df Merge commit '319aac3' into QA_4_2 2014-10-21 10:27:49 -04:00
Marc Delisle
d0e3ab3bc9 4.2.10.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-21 10:26:58 -04:00
Smita Kumari
d87a99e01c moving inline js out from db_designer.lib.php plus minor bug fixes 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-21 12:40:09 +05:30
Madhura Jayaratne
7b8962dede bug #4563 [security] XSS in monitor query analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 08:45:09 +05:30
Madhura Jayaratne
bd68c54d1b bug #4562 [security] XSS in debug SQL output 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-21 08:42:02 +05:30
Hugues Peccatte
20d7e0c71e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-20 21:10:58 +02:00
Hugues Peccatte
f5c271667b Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 21:10:39 +02:00
Hugues Peccatte
270d2a0cee Merge pull request #1382 from Tithugues/b4559_master 
Fix #4559: don't use multibytes to read hash.
 2014-10-20 21:08:18 +02:00
Hugues Peccatte
a4546feda1 Fix #4559: don't use multibytes to read hash. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-20 19:24:00 +02:00
Marc Delisle
8a3bf5af9f Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-20 13:14:05 -04:00
Weblate
c541114ddb Merge remote-tracking branch 'origin/master' 2014-10-20 11:27:33 +02:00
josep constanti
03b84715f6 Translated using Weblate (Catalan) 
Currently translated at 83.5% (2484 of 2973 strings)

[CI skip]
 2014-10-20 11:27:32 +02:00
Madhura Jayaratne
d2aec03f2b Do not remove throbber in case of aborted ajax filter calls 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-20 14:56:40 +05:30
Marc Delisle
9680410019 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-19 10:13:07 -04:00
Chirayu Chiripal
b21314179b phpdoc variable type fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-10-19 16:59:14 +05:30
Weblate
8186a0e462 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-19 05:19:09 +02:00
Tor Stokkan
331d89c0bc Translated using Weblate (Norwegian Bokmål) 
Currently translated at 65.4% (1813 of 2768 strings)

[CI skip]
 2014-10-19 05:19:07 +02:00
Giovanni Sora
af6e87f278 Translated using Weblate (Interlingua) 
Currently translated at 62.4% (1728 of 2768 strings)

[CI skip]
 2014-10-19 05:19:06 +02:00
Madhura Jayaratne
e67abc737a Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:48:31 +05:30
Madhura Jayaratne
8785ea0e34 Adjust tests for commit 3ec96cb038 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-19 08:22:06 +05:30
Madhura Jayaratne
aaa2116b01 Fix some of the failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 21:59:33 +05:30