gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,668 Commits 12 Branches 481 Tags 2.4 GiB
873ffa3ffe
Commit Graph

92668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Tor Stokkan
ac27cd2026 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 65.4% (1811 of 2768 strings)

[CI skip]
 2014-10-18 07:48:02 +02:00
julianladisch
27637d9ca0 Translated using Weblate (German) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-18 02:05:27 +02:00
Weblate
e7f1c8506f Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-17 09:45:00 +02:00
Edgars Neimanis
bb056b5a20 Translated using Weblate (Latvian) 
Currently translated at 23.9% (664 of 2768 strings)

[CI skip]
 2014-10-17 09:44:58 +02:00
Madhura Jayaratne
bdd76f18ce bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:14:28 +05:30
Weblate
f3fe7ca528 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-16 21:13:36 +02:00
Burak Yavuz
aa3fd712e9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-16 21:13:35 +02:00
Michael Koch
85866b8a84 Translated using Weblate (German) 
Currently translated at 99.6% (2759 of 2768 strings)

[CI skip]
 2014-10-16 21:13:33 +02:00
josep constanti
c7de289f95 Translated using Weblate (Catalan) 
Currently translated at 87.5% (2424 of 2768 strings)

[CI skip]
 2014-10-16 21:13:31 +02:00
Boyan Kehayov
a10ce357a0 Translated using Weblate (Bulgarian) 
Currently translated at 66.0% (1828 of 2768 strings)

[CI skip]
 2014-10-16 21:13:30 +02:00
Chanaka Dharmarathna
38f3ae91ce Merge branch 'madhuracj-Bug4552' into QA_4_2 2014-10-17 00:41:32 +05:30
Chanaka Dharmarathna
3e70eb4789 Resolved merge conflict in Changelog 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-17 00:41:07 +05:30
Marc Delisle
39498e594c Move ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-13 10:12:22 -04:00
Weblate
33a39799a0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-13 16:03:27 +02:00
josep constanti
bb49e4a50f Translated using Weblate (Catalan) 
Currently translated at 87.2% (2414 of 2768 strings)

[CI skip]
 2014-10-13 16:03:26 +02:00
hassan mokhtari
61dedd8629 Translated using Weblate (Arabic) 
Currently translated at 41.0% (1137 of 2768 strings)

[CI skip]
 2014-10-13 16:03:24 +02:00
Smita Kumari
b57fc337dd Merge pull request #1376 from smita786/QA_4_2 
Fix: Table_onover is not defined error.
 2014-10-13 19:33:22 +05:30
Smita Kumari
bd259a9ed9 removing extra slash character 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-13 19:29:21 +05:30
Marc Delisle
360073a933 4.2.10 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:58:03 -04:00
Marc Delisle
319aac3c76 4.2.10 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:57:20 -04:00
Weblate
f1d862096d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-11 13:50:15 +02:00
Anders Jonsson
6dcb49a959 Translated using Weblate (Swedish) 
Currently translated at 99.7% (2762 of 2768 strings)

[CI skip]
 2014-10-11 13:50:13 +02:00
Xosé Calvo
9492a73fd1 Translated using Weblate (Galician) 
Currently translated at 86.3% (2389 of 2768 strings)

[CI skip]
 2014-10-11 13:50:11 +02:00
Marc Delisle
4fb60125fb 4.2.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-11 07:49:52 -04:00
Weblate
44f127c318 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-10 08:08:53 +02:00
이 형진
d275e429c4 Translated using Weblate (Korean) 
Currently translated at 84.9% (2352 of 2768 strings)

[CI skip]
 2014-10-10 08:08:52 +02:00
Michael Koch
ef075ea270 Translated using Weblate (German) 
Currently translated at 99.5% (2756 of 2768 strings)

[CI skip]
 2014-10-10 08:08:51 +02:00
Madhura Jayaratne
dc4d694bd4 bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-10 11:38:19 +05:30
Weblate
3871584791 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-09 08:15:49 +02:00
Burak Yavuz
aebe78830e Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-09 08:15:48 +02:00
Michael Koch
6d34ce8543 Translated using Weblate (German) 
Currently translated at 99.2% (2746 of 2768 strings)

[CI skip]
 2014-10-09 08:15:46 +02:00
josep constanti
04fb8a291b Translated using Weblate (Catalan) 
Currently translated at 86.5% (2395 of 2768 strings)

[CI skip]
 2014-10-09 08:15:45 +02:00
Madhura Jayaratne
cbcacb0f0a Merge branch 'MAINT_4_2_9' into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:44:22 +05:30
Madhura Jayaratne
c42beaa705 Merge branch 'QA_4_2' into Bug4552 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:33:47 +05:30
Madhura Jayaratne
380e8940b1 bug #4552 Incorrect routines display for database due to case insensitive checks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:27:09 +05:30
Marc Delisle
de12f8359a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-08 08:45:05 -04:00
Weblate
21032ab3b1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-08 14:42:45 +02:00
Michael Koch
dc3cabd654 Translated using Weblate (German) 
Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]
 2014-10-08 14:42:44 +02:00
Marc Delisle
92efd1f7e1 Merge pull request #1374 from ashutoshdhundhara/bug_4554 
bug #4554 Grid-editing timestamp column forces datepicker.
 2014-10-08 08:42:34 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30
Madhura Jayaratne
01d6a06c52 Update Dummy DBI for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:33:25 +05:30
Madhura Jayaratne
c77fafd0d1 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:26:10 +05:30