gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,290 Commits 12 Branches 481 Tags 2.4 GiB
77fec70ee8
Commit Graph

96290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
77fec70ee8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-24 06:40:18 -05:00
Madhura Jayaratne
296a87c83d #4671 Unable to move all columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 13:49:53 +05:30
Madhura Jayaratne
204af78879 Merge pull request #1425 from madhuracj/Bug4642 
bug #4642 phpmyadmin often fails to load due to specific load order
 2014-12-24 12:04:12 +05:30
Madhura Jayaratne
aaa6b9d4d9 Merge branch 'QA_4_3' into Bug4642 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 12:03:25 +05:30
Madhura Jayaratne
32f1ac4211 bug #4670 CSV import reads both commas and values into first column after first row 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 11:52:20 +05:30
Madhura Jayaratne
bc25daf3f7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-24 10:30:48 +05:30
Madhura Jayaratne
48570a6dbd Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:25:21 +05:30
Weblate
33f3976a9e Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-24 05:46:13 +01:00
Robin van der Vliet
4f8b3e283f Translated using Weblate (Russian) 
Currently translated at 99.4% (2960 of 2977 strings)

[CI skip]
 2014-12-24 05:46:11 +01:00
Robin van der Vliet
42da835e33 Translated using Weblate (Kannada) 
Currently translated at 2.7% (83 of 2977 strings)

[CI skip]
 2014-12-24 05:46:08 +01:00
Madhura Jayaratne
7d492ba011 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:15:44 +05:30
Madhura Jayaratne
c95dc6d6cb Use default separator of space between messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:11:58 +05:30
Madhura Jayaratne
ab1c456bb1 bug #4668 Remove from central columns error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-24 10:06:52 +05:30
Robin van der Vliet
9864ae0bab Translated using Weblate (Dutch) 
Currently translated at 100.0% (2977 of 2977 strings)

[CI skip]
 2014-12-24 03:10:17 +01:00
Robin van der Vliet
99412808a4 Translated using Weblate (Punjabi) 
Currently translated at 0.1% (5 of 2977 strings)

[CI skip]
 2014-12-24 02:52:22 +01:00
Robin van der Vliet
ec712e1810 Translated using Weblate (Kannada) 
Currently translated at 0.0% (2 of 2977 strings)

[CI skip]
 2014-12-24 02:11:33 +01:00
Robin van der Vliet
0b927efe42 Translated using Weblate (West Flemish) 
Currently translated at 3.0% (90 of 2977 strings)

[CI skip]
 2014-12-24 01:36:55 +01:00
Robin van der Vliet
4db61785af Translated using Weblate (West Flemish) 
Currently translated at 0.1% (4 of 2977 strings)

[CI skip]
 2014-12-23 23:33:36 +01:00
Hugues Peccatte
647078cab3 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-23 22:38:35 +01:00
Atul Pratap Singh
b9cb88c5fc Merge pull request #1436 from smita786/QA_4_3 
fix bug #4665
 2014-12-23 18:55:27 +05:30
Smita Kumari
af33e8a144 fix bug #4665 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-12-23 18:38:46 +05:30
Marc Delisle
a6c53149be ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 08:03:09 -05:00
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
Hugues Peccatte
2dcb1c9b0a Fix #4645 Import of export created with mysqldump 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-21 22:57:25 +01:00
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