Commit Graph

92536 Commits

Author SHA1 Message Date
Marc Delisle
d6cf9ebaaa bug in server_privileges.js: cannot read property
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-29 09:08:02 -04:00
Atul Pratap Singh
7e5026cde4 Fix bug#4413 Navigation Error in Nav Tree for Search Results Past the First Page
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-08-29 14:19:38 +05:30
Marc Delisle
74ae4a2938 Merge pull request #1346 from smita786/QA_4_2
update unit test needed after fixing bug 4487
2014-08-28 15:43:05 -04:00
Smita Kumari
3b479f52f9 fix unit test
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-28 22:48:35 +05:30
Weblate
5c118629c0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-28 18:35:49 +02:00
Alex Smirnov
ed284bd574 Translated using Weblate (Russian)
Currently translated at 99.8% (2765 of 2768)

[ci skip]
2014-08-28 18:35:45 +02:00
Marc Delisle
14d9437c04 Merge pull request #1345 from smita786/QA_4_2
update bug fix #4487
2014-08-28 12:35:34 -04:00
Smita Kumari
fed466498e update bug fix #4487
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-28 21:12:04 +05:30
Marc Delisle
3a9e2bbf65 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-27 12:54:26 -04:00
Weblate
d789ee4bbe Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-27 18:52:24 +02:00
Chien Wei Lin
9776abce46 Translated using Weblate (Traditional Chinese)
Currently translated at 99.8% (2765 of 2768)

[ci skip]
2014-08-27 18:52:21 +02:00
Marc Delisle
ebf07e8131 Merge pull request #1344 from smita786/QA_4_2
fix bug #4487
2014-08-27 12:52:14 -04:00
Smita Kumari
83e90ae1a0 bug fix #4487
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-27 19:12:27 +05:30
Weblate
58e4568277 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-26 13:55:01 +02:00
Alex Smirnov
d34086b168 Translated using Weblate (Russian)
Currently translated at 99.8% (2765 of 2768)

[ci skip]
2014-08-26 13:54:58 +02:00
Marc Delisle
2e37de57ca Fix undefined variable notice; fix parameter type
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-26 07:54:38 -04:00
Weblate
5b749b8c4c Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-25 18:42:20 +02:00
கணேஷ் குமார்
ae88c8daad Translated using Weblate (Tamil)
Currently translated at 37.3% (1033 of 2768)

[ci skip]
2014-08-25 18:42:16 +02:00
Marc Delisle
ac7a6cee32 bug #4522 Duplicate column names while assigning index
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-25 12:41:51 -04:00
Marc Delisle
8862de224a bug #4518 Export to SQL: CREATE TABLE option AUTO_INCREMENT ignored
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-21 13:06:48 -04:00
Marc Delisle
7c29ef9438 Merge pull request #1340 from smita786/QA_4_2
Fix bug #4518
2014-08-21 13:04:59 -04:00
Smita Kumari
89d57f8336 Fix bug #4518
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
2014-08-21 21:39:11 +05:30
Madhura Jayaratne
fae3858669 bug #4521 Initially allowed chart types do not match selected data
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-08-21 19:24:33 +05:30
Weblate
70e52f3cb3 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-20 18:28:05 +02:00
Alex Smirnov
17b8f3efb3 Translated using Weblate (Ukrainian)
Currently translated at 96.9% (2683 of 2768)

[ci skip]
2014-08-20 18:28:02 +02:00
s.c. yoo
dcb290fc10 Translated using Weblate (Korean)
Currently translated at 83.3% (2308 of 2768)

[ci skip]
2014-08-20 18:27:59 +02:00
Marc Delisle
4992cea190 bug #4520 sql.js: cannot read property
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-08-20 12:27:05 -04:00
Weblate
fedc2ba51d Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-19 14:51:47 +02:00
Alex Smirnov
c9807b838f Translated using Weblate (Ukrainian)
Currently translated at 95.8% (2653 of 2768)

[ci skip]
2014-08-19 14:51:44 +02:00
Alecsandru Prună
af6b8da5a7 Translated using Weblate (Romanian)
Currently translated at 61.8% (1713 of 2768)

[ci skip]
2014-08-19 14:51:42 +02:00
Pl
4db6c42bc8 Translated using Weblate (Bulgarian)
Currently translated at 64.8% (1795 of 2768)

[ci skip]
2014-08-19 14:51:39 +02: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
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
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
Marc Delisle
a22324185f Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-08-14 12:07:35 -04:00