Commit Graph

96264 Commits

Author SHA1 Message Date
Marc Delisle
ac6657c1fd Merge pull request #1435 from madhuracj/Bug4663
#4663 Export missing back ticks for order table name
2014-12-23 08:02:04 -05:00
Atul Pratap Singh
a98ec2c162 Fix js reports; TypeError: /([a-zA-Z]+):/.exec(...) is null
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-12-23 17:22:47 +05:30
Madhura Jayaratne
c445794bde bug #4666 Undefined indexes in table stucture print view of a view
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 16:50:47 +05:30
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 15:03:23 +05:30
Atul Pratap Singh
21b63f9af4 Fix js reports: JSONparse Syntax Error: Unexpected token '<'
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
2014-12-23 14:16:56 +05:30
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 12:53:12 +05:30
Marc Delisle
f735d2360b Merge pull request #1434 from Tithugues/b4648_qa43_browseTab
Remove borders in table browse tab (linked to #4648).
2014-12-22 11:51:49 -05:00
Hugues Peccatte
66c7c04582 Remove borders in table browse tab (linked to #4648).
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-22 14:16:40 +01:00
Madhura Jayaratne
481e89ac94 Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-22 07:32:05 -05:00
Madhura Jayaratne
fbe587ce73 bug #4661 Drag and drop file import always fails
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-22 17:09:10 +05:30
Madhura Jayaratne
bac38f3ef6 bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-22 14:58:58 +05:30
Michal Čihař
fb731ad37b Merge remote-tracking branch 'weblate-4.3/QA_4_3' into QA_4_3
Conflicts:
	po/nl.po
2014-12-21 13:05:45 +01:00
Marc Delisle
3960df34bc 4.3.4-dev
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-21 06:31:09 -05:00
A. Voogt
8b695200e7 Translated using Weblate (Dutch)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-21 12:12:31 +01:00
Marc Delisle
409049ce33 Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-21 06:11:56 -05:00
Marc Delisle
e88e44f554 ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 15:04:22 -05:00
Weblate
ec4d80b98d Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-20 21:00:45 +01:00
A. Voogt
5a90333587 Translated using Weblate (Dutch)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-20 21:00:43 +01:00
Marc Delisle
c64b77981e Merge pull request #1431 from rakeshkaundilya/QA_4_3
fix bug #4659: trim white spaces
2014-12-20 15:00:40 -05:00
Rakesh Kumar
8415dd4d35 fix bug #4659: trim white spaces
Signed-off-by: Rakesh Kumar <rakeshkumar4294@gmail.com>
2014-12-21 00:55:20 +05:30
Luis Garcia
d1a4e7d7cc Translated using Weblate (Spanish)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-20 20:06:24 +01:00
Weblate
1ee864d74c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-20 19:32:56 +01:00
Balázs Úr
e2f8b75c16 Translated using Weblate (Hungarian)
Currently translated at 80.1% (2386 of 2978 strings)

[CI skip]
2014-12-20 19:32:53 +01:00
A. Voogt
ea6e62b7e0 Translated using Weblate (Dutch)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-20 19:32:52 +01:00
Marc Delisle
5429d91ce1 bug ['Error_Handler']['display'] no longer necessary
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 13:32:34 -05:00
Weblate
1a0603cf66 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-20 13:12:24 +01:00
Kristjan Räts
fb523a0c61 Translated using Weblate (Estonian)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-20 13:12:22 +01:00
Marc Delisle
cbc0b61add Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 07:12:06 -05:00
Weblate
57deba8567 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-19 14:04:43 +01:00
HM
00655de66b Translated using Weblate (Persian)
Currently translated at 28.7% (856 of 2978 strings)

[CI skip]
2014-12-19 14:04:40 +01:00
Ann + J.M
67d4128d53 Translated using Weblate (German)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-19 14:04:38 +01:00
Kristjan Räts
e526232775 Translated using Weblate (Estonian)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-19 14:04:37 +01:00
Viktar Palstsiuk
b27c5b62b4 Translated using Weblate (Belarusian)
Currently translated at 27.9% (831 of 2978 strings)

[CI skip]
2014-12-19 14:04:35 +01:00
Marc Delisle
8f475aebcb bug #4656 Some error popups fade away too quickly
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-19 08:04:23 -05:00
Marc Delisle
00585592b6 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2014-12-17 10:37:23 -05:00
Marc Delisle
b788a1ce3d bug #4657 Don't have default blowfish_secret
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-17 10:37:11 -05:00
Weblate
8510ac3a83 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-17 16:01:06 +01:00
Szász Attila
e46bf3ae48 Translated using Weblate (Hungarian)
Currently translated at 80.0% (2384 of 2978 strings)

[CI skip]
2014-12-17 16:01:03 +01:00
Marc Delisle
4ef98d5a82 Adjust headers when favorite tables are disabled
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-17 10:00:49 -05:00
Kristjan Räts
1cfaed0a83 Translated using Weblate (Estonian)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-17 09:49:46 +01:00
Marc Delisle
266f4c7bb6 Bug Undefined index central_columnswork
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-16 13:32:52 -05:00
Weblate
9894cbdc0c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-16 15:56:05 +01:00
Παναγιώτης Παπάζογλου
8952147178 Translated using Weblate (Greek)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-16 15:56:02 +01:00
Marc Delisle
fb7e54f25b ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-16 09:55:13 -05:00
Martin Riedl
fa4421ed38 Fix initial replication configuration
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-16 09:54:46 -05:00
Marc Delisle
aabee18d82 Translated using Weblate (French)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-16 13:21:32 +01:00
Dieter Adriaenssens
5dcc451a5f Translated using Weblate (Dutch)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-16 11:20:25 +01:00
Burak Yavuz
0e0eda5ff1 Translated using Weblate (Turkish)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-16 06:52:36 +01:00
Domen
ca4f22f76b Translated using Weblate (Slovenian)
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
2014-12-15 22:49:53 +01:00
Marc Delisle
301105871d Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-15 15:54:56 -05:00