gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,773 Commits 12 Branches 481 Tags 2.4 GiB
d75c68d589
Commit Graph

102773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
d75c68d589 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-18 15:39:17 +01:00
Giovanni Sora
c774ccc4f6 Translated using Weblate (Interlingua) 
Currently translated at 72.5% (2329 of 3210 strings)

[CI skip]
 2015-12-18 15:39:16 +01:00
Xosé Calvo
0516a406b5 Translated using Weblate (Galician) 
Currently translated at 83.3% (2676 of 3210 strings)

[CI skip]
 2015-12-18 15:39:15 +01:00
Marc Delisle
07974ec70d Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-18 15:39:15 +01:00
Deven Bansod
99e30eff73 Merge pull request #11762 from devenbansod/fix_11757 
Fix #11757 : Export and preview show different SQL for character set - Use 'CHARSET='  uniformly with respect to table 'show create' and table 'export'
 2015-12-18 20:09:10 +05:30
Deven Bansod
a4f02ca28f Fix #11757 : Export and preview show different SQL for character set 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-18 19:03:24 +05:30
Michal Čihař
f5246d1dbe Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 21:22:15 +01:00
Παναγιώτης Παπάζογλου
52263431ee Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 16:58:37 +01:00
Anna Henningsen
59fdb334c8 Translated using Weblate (German) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 13:57:43 +01:00
Burak Yavuz
f39e5147b4 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:14:46 +01:00
Kristjan Räts
c86db814c3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2015-12-17 12:07:20 +01:00
Michal Čihař
9d18e90afb Missing quoting of table in ALTER CONVERT query 
Fixes #11758

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-17 11:33:55 +01:00
Michal Čihař
160d6e2e20 Merge remote-tracking branch 'weblate-4.5/QA_4_5' into QA_4_5 2015-12-16 08:13:08 +01:00
Krystian Biesaga
369d42f0e8 Translated using Weblate (Polish) 
Currently translated at 82.7% (2657 of 3211 strings)

[CI skip]
 2015-12-16 08:08:43 +01:00
Michal Čihař
e0ad034681 Remove \b from the messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:05:05 +01:00
Michal Čihař
a36a80f3df Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 08:01:02 +01:00
Marc Delisle
80a0b426cf ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-15 06:26:24 -05:00
Marc Delisle
129791d082 Merge pull request #11748 from devenbansod/fix_11720 
Fix #11720
 2015-12-15 06:25:13 -05:00
Deven Bansod
f6b9340e1b Check for duplication only when username field is edited 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-12-15 12:18:08 +05:30
Marc Delisle
bf074566b5 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:39:29 -05:00
Marc Delisle
5a77115ac5 Merge pull request #11738 from Achilles-96/QA_4_5 
Fixes #11679
 2015-12-13 19:37:52 -05:00
Achilles-96
4b8983028a Fixes #11679 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 00:31:09 +05:30
Madhura Jayaratne
968bfd354c Fix broken tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 19:18:53 +11:00
Madhura Jayaratne
6016b64836 Loosen some assertions. We are tying to prevent calls to dbi. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:15:00 +11:00
Madhura Jayaratne
76a416283a Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:07:46 +11:00
Madhura Jayaratne
ceeec424d7 #11728 CSV import skip row count after 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 17:00:38 +11:00
Madhura Jayaratne
d9279025f9 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-11 16:27:35 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Marc Delisle
d008352582 IE 8 compatibility in console 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-10 12:18:38 -05:00
Weblate
eab28e3be1 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-09 21:02:04 +01:00
Jozef Pistej
ed47d0fbdb Translated using Weblate (Slovak) 
Currently translated at 83.5% (2682 of 3211 strings)

[CI skip]
 2015-12-09 21:02:03 +01:00
Anton Alekseevich
fa18c2964d Translated using Weblate (Russian) 
Currently translated at 97.9% (3144 of 3211 strings)

[CI skip]
 2015-12-09 21:02:03 +01:00
신흥재
2867358b57 Translated using Weblate (Korean) 
Currently translated at 78.1% (2509 of 3211 strings)

[CI skip]
 2015-12-09 21:02:02 +01:00
Madhura Jayaratne
269fcd2a54 issue #11724 Temporary fix for live data edit of big sets is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-10 07:01:42 +11:00
Michal Čihař
b96aa8ff94 Avoid duplicite fetching of table information 
We already have that, so there is no need to issue the query
again.

Fixes #11714

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:39:11 +01:00
Michal Čihař
1c5304f95b Fix RTN tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:08:36 +01:00
Michal Čihař
8681ef6b74 Fix tracker tests for new escaping 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:06:19 +01:00
Michal Čihař
fe135a5206 Fix test expectations 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:46 +01:00
Michal Čihař
22b065f670 Add missing require 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 16:00:18 +01:00
Michal Čihař
8742209c63 Fix single quote export for servers in ANSI_QUOTES mode 
It is possible to escape ' inside '' as both '' and \'. However using ''
is MySQL extension and does not work in ANSI mode. We need to generate
compatible exports in this case, so sticking with \' is safer.

Fixes #11721

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 15:33:37 +01:00
Weblate
39c97184e8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-07 06:59:54 +01:00
Yong Kim
5f0c55da4a Translated using Weblate (Korean) 
Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]
 2015-12-07 06:59:53 +01:00
Madhura Jayaratne
0375802fc0 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-12-07 16:59:22 +11:00
Madhura Jayaratne
dade3fa2e4 Fix #11706 Database export template not saving compression option 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-07 16:56:18 +11:00
Marc Delisle
23a70525ae This was related to the previous SQL parser. If someone still needs it 
to decode an old bug report, he/she can still get this script from
an older branch.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-06 08:07:52 -05:00
Weblate
ca32b9f51a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-12-04 12:14:58 +01:00
Burak Yavuz
5f02ec86f3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-12-04 12:14:57 +01:00
Giovanni Sora
af95b43554 Translated using Weblate (Interlingua) 
Currently translated at 72.5% (2329 of 3211 strings)

[CI skip]
 2015-12-04 12:14:56 +01:00
Michal Čihař
17930c26df Properly report error on connecting 
The $link can be false at this point and DBI backends handle this
correctly to get global error. This usually happens on connecting.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 12:13:47 +01:00
Madhura Jayaratne
d33af6a721 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-12-02 10:36:12 +11:00