Commit Graph

94823 Commits

Author SHA1 Message Date
Alex Smirnov
22da4e0dd5 Translated using Weblate (Ukrainian)
Currently translated at 91.5% (2713 of 2965)

[ci skip]
2014-08-20 14:27:17 +02:00
s.c. yoo
56220b4770 Translated using Weblate (Korean)
Currently translated at 77.6% (2301 of 2965)

[ci skip]
2014-08-20 14:27:13 +02:00
Hugues Peccatte
570ca18011 PHPDoc update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-08-19 17:23:41 +02:00
Marc Delisle
29fca69f57 Merge branch 'QA_4_2' 2014-08-19 08:52:06 -04:00
Marc Delisle
0b4909a584 Merge commit '9109c96' 2014-08-19 08:51:59 -04:00
Marc Delisle
a2ab758e9b bug #4519 Uncaught TypeError: Cannot read property 'success' of null
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-19 08:51:15 -04:00
Remi Collet
4f352990dc fix gettext include path
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-19 07:49:15 -04:00
Marc Delisle
5a677a3ec4 Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-18 21:34:19 -04:00
Marc Delisle
6d3a919ee0 Fix parameter type
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-18 21:10:49 -04:00
Alex Smirnov
f6b1462ed1 Translated using Weblate (Ukrainian)
Currently translated at 88.3% (2619 of 2965)

[ci skip]
2014-08-18 15:18:53 +02:00
Pl
9b564d2e4e Translated using Weblate (Bulgarian)
Currently translated at 59.3% (1760 of 2965)

[ci skip]
2014-08-18 15:18:51 +02:00
Marc Delisle
8da8eb2a4f Translated using Weblate (French)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-18 15:18:32 +02:00
Kristjan Räts
4b6831c916 Translated using Weblate (Estonian)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-18 09:18:49 +02:00
Ibrahim Redzhebov
9109c96322 Translated using Weblate (Bulgarian)
Currently translated at 64.4% (1785 of 2768)

[ci skip]
2014-08-17 20:57:43 +02:00
Domen
8b5634502a Translated using Weblate (Slovenian)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-17 20:05:49 +02:00
Weblate
31875e2730 Merge remote-tracking branch 'origin/master' 2014-08-17 19:37:30 +02:00
Ibrahim Redzhebov
3e3ad02128 Translated using Weblate (Bulgarian)
Currently translated at 59.0% (1751 of 2965)

[ci skip]
2014-08-17 19:37:25 +02:00
Marc Delisle
f7fd63916c Merge pull request #1337 from ashutoshdhundhara/scrutinizer_fix
Fix issues reported by Scrutinizer.
2014-08-17 13:37:22 -04:00
Marc Delisle
440fddd85e Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-08-17 12:50:04 -04:00
Marc Delisle
0927941195 Merge commit 'f47eaae' 2014-08-17 12:49:47 -04:00
Weblate
8faf31cba0 Merge remote-tracking branch 'origin/master' 2014-08-17 18:48:50 +02:00
Alex Smirnov
756e7a00e8 Translated using Weblate (Ukrainian)
Currently translated at 88.2% (2617 of 2965)

[ci skip]
2014-08-17 18:48:46 +02:00
Alecsandru Prună
ba7a744dc8 Translated using Weblate (Romanian)
Currently translated at 60.6% (1797 of 2965)

[ci skip]
2014-08-17 18:48:43 +02:00
Panagiotis Papazoglou
3c4ad5d52b Translated using Weblate (Greek)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-17 18:48:40 +02:00
Marc Delisle
8ee9b58d90 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 12:48:09 -04:00
Marc Delisle
38b8cd7a80 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 12:40:53 -04:00
Marc Delisle
0c7702518b Merge commit '773c507' 2014-08-17 12:40:01 -04:00
Weblate
f47eaae742 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-17 15:48:26 +02:00
Alex Smirnov
03cdd61096 Translated using Weblate (Ukrainian)
Currently translated at 95.7% (2651 of 2768)

[ci skip]
2014-08-17 15:48:23 +02:00
Burak Yavuz
0b92a3d64d Translated using Weblate (Turkish)
Currently translated at 100.0% (2768 of 2768)

[ci skip]
2014-08-17 15:48:20 +02:00
Alecsandru Prună
f7be3ba54b Translated using Weblate (Romanian)
Currently translated at 61.5% (1704 of 2768)

[ci skip]
2014-08-17 15:48:17 +02:00
Sevdimali İsa
052cd954ac Translated using Weblate (Azerbaijani)
Currently translated at 47.6% (1319 of 2768)

[ci skip]
2014-08-17 15:48:14 +02:00
Marc Delisle
e0043d959e Merge commit '7f977f4' into QA_4_2 2014-08-17 09:47:51 -04:00
Marc Delisle
30ffae63cf Merge commit '3ffc967' into QA_4_2 2014-08-17 09:46:21 -04:00
Marc Delisle
cfc1e45510 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 09:45:39 -04:00
Marc Delisle
6c9d6a96be Merge commit '773c507' into QA_4_2 2014-08-17 09:44:06 -04:00
Marc Delisle
7f977f4633 4.2.7.1 release
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:56:43 -04:00
Madhura Jayaratne
3ffc967fb6 bug #4517 [security] XSS in relation view
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:54:05 -04:00
Madhura Jayaratne
90ddeecf60 bug #4504 [security] Self-XSS in query charts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:52:05 -04:00
Madhura Jayaratne
cd9f302bf7 bug #4503 [security] Self-XSSes in monitor
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:50:27 -04:00
Madhura Jayaratne
2c45d7caa6 bug #4502 [security] Self-XSS in enum value editor
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:47:53 -04:00
Madhura Jayaratne
647c9d12e3 bug #4501 [security] XSS in table browse page
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:45:10 -04:00
Madhura Jayaratne
0cd293f5e1 bug #4505 [security] XSS in view operations page
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-17 08:41:57 -04:00
Burak Yavuz
0d8c331a97 Translated using Weblate (Turkish)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-16 22:58:49 +02:00
Ashutosh Dhundhara
60610f9b83 Fix issues reported by Scrutinizer.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-17 02:20:05 +05:30
Matías Bellone
aa326cb015 Translated using Weblate (Spanish)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-16 22:40:22 +02:00
Panagiotis Papazoglou
c8522ca8f4 Translated using Weblate (Greek)
Currently translated at 100.0% (2965 of 2965)

[ci skip]
2014-08-16 20:58:45 +02:00
Marc Delisle
8551a4dc80 Update po files 2014-08-16 14:26:46 -04:00
Marc Delisle
5818cd807e Remove trailing whitespace
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-16 14:24:41 -04:00
Marc Delisle
f1c5ec25c7 Merge pull request #1336 from Chanaka/RFE-1521
rfe-1521 : Add confirmation, when delete user
2014-08-16 14:21:41 -04:00