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

95537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Madhura Jayaratne
c4f67f05c8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-18 20:40:37 +05:30
Madhura Jayaratne
d0b1002893 Include by default 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-18 20:15:10 +05:30
Dieter Adriaenssens
d898d66229 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-18 16:21:57 +02:00
Weblate
ce85124fab Merge remote-tracking branch 'origin/master' 2014-10-18 14:31:41 +02:00
Tor Stokkan
346db836b2 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.9% (1782 of 2973 strings)

[CI skip]
 2014-10-18 14:31:40 +02:00
Giovanni Sora
45c2189a34 Translated using Weblate (Interlingua) 
Currently translated at 63.7% (1895 of 2973 strings)

[CI skip]
 2014-10-18 14:31:38 +02:00
Marc Delisle
3ec96cb038 Remove unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-18 08:31:26 -04:00
Tor Stokkan
69950373d5 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.8% (1780 of 2973 strings)

[CI skip]
 2014-10-18 07:48:22 +02:00
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
Madhura Jayaratne
e985d56fe4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-18 07:07:14 +05:30
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
julianladisch
2886766381 Translated using Weblate (German) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-17 22:51:05 +02:00
Domen
38aac207a8 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-17 22:43:46 +02:00
Weblate
4559bbfb1d Merge remote-tracking branch 'origin/master' 2014-10-17 14:06:35 +02:00
Giovanni Sora
dc23f789fa Translated using Weblate (Interlingua) 
Currently translated at 62.9% (1872 of 2973 strings)

[CI skip]
 2014-10-17 14:06:33 +02:00
Marc Delisle
d3d0768693 Merge commit 'e7f1c85' 2014-10-17 08:06:19 -04:00
Giovanni Sora
b4d97de678 Translated using Weblate (Interlingua) 
Currently translated at 62.5% (1861 of 2973 strings)

[CI skip]
 2014-10-17 13:58:58 +02:00
Marc Delisle
dffc085e0f Translated using Weblate (French) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-17 13:56:58 +02:00
Madhura Jayaratne
fa3c538341 Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 15:08:28 +05:30
Madhura Jayaratne
6086856d24 Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 15:08:07 +05:30
Kristjan Räts
001ebb8d03 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-17 11:17:49 +02:00
Weblate
7b3e081aa0 Merge remote-tracking branch 'origin/master' 2014-10-17 10:05:49 +02:00