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

102645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
2fa2d12cb1 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-11-02 07:48:51 +11:00
Madhura Jayaratne
1698c5db44 Fix #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-02 07:46:39 +11:00
Weblate
51e6ba48a8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-01 11:53:07 +01:00
Jerry Gullstrand
4093031470 Translated using Weblate (Swedish) 
Currently translated at 99.6% (3199 of 3211 strings)

[CI skip]
 2015-11-01 11:53:07 +01:00
Kelvin Lee
187eb58279 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-01 11:53:05 +01:00
disorderman
59adc96f56 Translated using Weblate (Chinese (China)) 
Currently translated at 89.4% (2872 of 3211 strings)

[CI skip]
 2015-11-01 11:53:05 +01:00
Marc Delisle
90224e23c7 Merge pull request #11629 from nisargjhaveri/issue_11627 
fix #11627, CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
 2015-11-01 05:52:59 -05:00
Nisarg Jhaveri
b4044bb770 fix #11627, CREATE TABLE/INSERT INTO executed twice (ctrl+enter) 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-01 03:51:45 +05:30
zz
7c5de12faf Translated using Weblate (Chinese (China)) 
Currently translated at 89.4% (2871 of 3211 strings)

[CI skip]
 2015-10-30 08:33:27 +01:00
Marc Delisle
9fb7b9828d Merge pull request #11615 from devenbansod/fix_11605_2 
Fix issue 11605 - new
 2015-10-28 08:43:01 -04:00
Deven Bansod
d604a36135 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 22:18:38 +05:30
Weblate
3e1da7914e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-28 08:44:42 +01:00
Παναγιώτης Παπάζογλου
85873bf1b5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 08:44:42 +01:00
Madhura Jayaratne
4fd5a3a0ad Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-10-28 18:44:31 +11:00
Madhura Jayaratne
4b4f032046 Fix #11614 Undefined variable: db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-28 18:42:34 +11:00
Domen
2936ecc418 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 00:33:43 +01:00
Marc Delisle
2838f2505b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-27 12:56:27 -04:00
Marc Delisle
d7ba4a5449 Merge pull request #11613 from devenbansod/fix_11605 
Fix issue #11605
 2015-10-27 12:55:37 -04:00
Deven Bansod
1e6f128202 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 03:17:51 +05:30
Marc Delisle
1b2cd3c39f Translated using Weblate (French) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 12:44:15 +01:00
Madhura Jayaratne
3b4d9ddcf2 #11612 Undefined index: new_row_format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 20:37:55 +11:00
Weblate
71c1551c58 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-27 09:48:57 +01:00
Stefano Martinelli
2e9f7c7170 Translated using Weblate (Italian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 09:48:56 +01:00
Madhura Jayaratne
c9df59687d Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-27 19:48:21 +11:00
Madhura Jayaratne
ac97a97cb8 Fix #11610, #11611 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 19:45:39 +11:00
dingo thirteen
5264982990 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 09:00:33 +01:00
Kristjan Räts
332a61c697 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 08:28:47 +01:00
Burak Yavuz
a63075fed9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-27 05:44:32 +01:00
Marc Delisle
be2f978a6a Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-26 19:59:33 -04:00
Weblate
aa770c3de5 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-26 22:10:07 +01:00
Michal Čihař
085087061c Translated using Weblate (Korean) 
Currently translated at 77.9% (2503 of 3211 strings)

[CI skip]
 2015-10-26 22:10:07 +01:00
Madhura Jayaratne
dc5e057fe2 Fix #11607 Unable to change password from Login information tab - make the error message more explicit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-27 08:09:43 +11:00
Madhura Jayaratne
653d800a5b Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 19:15:39 +11:00
Madhura Jayaratne
5ca47d209b Search clause is also a part of the query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 19:14:12 +11:00
Kristjan Räts
cfaa76c4ae Translated using Weblate (Estonian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 08:17:39 +01:00
Madhura Jayaratne
2a0b927606 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-26 17:49:13 +11:00
Madhura Jayaratne
f859287249 Update dummy queries as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:32:38 +11:00
Weblate
90d4abd400 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-26 07:06:23 +01:00
Domen
edaffe0f58 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 07:06:23 +01:00
Paulo Lopes Duarte
713472da84 Translated using Weblate (Portuguese) 
Currently translated at 54.6% (1755 of 3211 strings)

[CI skip]
 2015-10-26 07:06:22 +01:00
Julian Ladisch
ef90ba025c Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-26 07:06:22 +01:00
Madhura Jayaratne
2e3ed069c6 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 17:06:04 +11:00
Madhura Jayaratne
6c002b9fbc Fix #11594 'only_db' config option bug when db names contain underscore and are grouped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-26 16:55:30 +11:00
Weblate
4f8bb8fdda Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-25 13:19:14 +01:00
Hanson String
561cf03f93 Translated using Weblate (Korean) 
Currently translated at 77.8% (2501 of 3211 strings)

[CI skip]
 2015-10-25 13:19:13 +01:00
Marc Delisle
78f7ef3ea3 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-25 08:19:04 -04:00
Marc Delisle
d809b4cbee ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-24 16:28:28 -04:00
Weblate
fa16adca88 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-24 22:27:27 +02:00
Andrey Aleksanyants
33c6dabfb8 Translated using Weblate (Armenian) 
Currently translated at 67.2% (2160 of 3211 strings)

[CI skip]
 2015-10-24 22:27:25 +02:00
Marc Delisle
b13a92d603 Merge pull request #11601 from devenbansod/fix_11597 
Fix #11597
 2015-10-24 16:27:21 -04:00