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

105228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
2f1c996409 Fix #12099 Undefined index: controllink 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-16 20:44:32 +11:00
Madhura Jayaratne
c8e51a1b59 Fix #12092 Rename exported databases/tables doesn't seem to work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-14 22:13:48 +11:00
Weblate
be0e5bf105 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-11 10:12:42 +01:00
Pedro Ribeiro
4c8a53c6b4 Translated using Weblate (Portuguese) 
Currently translated at 54.1% (1739 of 3211 strings)

[CI skip]
 2016-03-11 10:12:42 +01:00
Madhura Jayaratne
03819741ec Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-03-11 20:12:33 +11:00
Madhura Jayaratne
46a32f55a0 Fix a style error in print view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-11 20:04:29 +11:00
Paulo Lopes Duarte
acb1862b8a Translated using Weblate (Portuguese) 
Currently translated at 53.8% (1728 of 3211 strings)

[CI skip]
 2016-03-10 11:14:35 +01:00
Pedro Ribeiro
e539a53f1d Translated using Weblate (Portuguese) 
Currently translated at 53.8% (1728 of 3211 strings)

[CI skip]
 2016-03-10 11:12:59 +01:00
Tiago Rozeira
8a34ea60d0 Translated using Weblate (Portuguese) 
Currently translated at 53.7% (1726 of 3211 strings)

[CI skip]
 2016-03-10 11:02:49 +01:00
Madhura Jayaratne
86b9067969 Fix #12085 Like search strings being escaped incorrectly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-10 19:16:54 +11:00
Michal Čihař
8310691341 Add PHP 5.5.0 error codes as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 14:07:25 +01:00
Michal Čihař
3ec1ad0132 Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 2016-03-09 11:59:49 +01:00
Michal Čihař
07c2f26223 Add workaround for PHP bug 
I'm unable to better diagnose the problem right now, so let's workaround
it so that it's working for users.

Fixes #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 11:59:08 +01:00
Weblate
b25885ee43 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-09 11:43:42 +01:00
Julian Ladisch
315be0e456 Translated using Weblate (German) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2016-03-09 11:43:40 +01:00
Michal Čihař
c964633278 Provide diagnostics for JSON encoding errors 
Issue #11705

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 11:43:06 +01:00
Michal Čihař
b93ce993eb Fixed rendering of table stats 
Fixes #12081

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:13:33 +01:00
Michal Čihař
ace1faa085 Fixed parsing of field definition 
Fixes #12083

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-09 09:02:07 +01:00
Weblate
c8422b9700 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-03-08 06:04:46 +01:00
Michal Čihař
c690f60f50 Translated using Weblate (Korean) 
Currently translated at 78.0% (2505 of 3211 strings)

[CI skip]
 2016-03-08 06:04:45 +01:00
Madhura Jayaratne
e04585df5b Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6 
Conflicts:
	ChangeLog
 2016-03-08 16:04:31 +11:00
Madhura Jayaratne
ff743830ff Fix #12073 Hide edit and delete buttons when the results are not related to a table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-03-08 16:02:05 +11:00
Michal Čihař
f76ddbe7ab Update SQL parser to ad0e75faa6f6943d013f23d0d1ca31b4781e7b79 
- issue #12041 Fixed exporting tables with fields DEFAULT and COMMENT

Fixes #12041

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:50:21 +01:00
Michal Čihař
fe4a3e8727 Fixed processing of queries with escaped quotes 
Imported SQL parser d2e37de1dbec251556f35712bddcd61d24baaee6

Fixes #12054

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-02 14:04:00 +01:00
Isaac Bennetch
5125fc3bc0 Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6 2016-03-01 14:43:17 -05:00
Michal Čihař
9eee3353a6 Merge branch 'QA_4_5' into QA_4_6 2016-03-01 15:43:18 +01:00
Michal Čihař
12bf06e016 Add changelog for issue #12055 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:41:19 +01:00
Michal Čihař
02aa0729dc Make PMA_fatalError work even early 
The messaging framework can not make assumptions about available objects
as this doesn't have to be satisfied in early PMA_fatalError case.

Issue #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:36:05 +01:00
Michal Čihař
a6b3a9ce51 Fix error when we can not generate random string 
Fixes #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 15:35:53 +01:00
Isaac Bennetch
0fc00c0ab8 4.6.0-rc2 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:32:07 -05:00
Isaac Bennetch
ebaeaf9a5b 4.5.5.1 release date in ChangeLog 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-03-01 09:30:30 -05:00
Michal Čihař
8eee22be3a Lint templates as well 
This will help us spotting syntax errors even in files which are not
covered by tests.

Fixes #12055

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:48 +01:00
Michal Čihař
35becb00ee Fix duplicate function call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:06:06 +01:00
Michal Čihař
ed5a8307c7 Fix wrong merge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-01 08:00:54 +01:00
Weblate
d280e53aaa Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-29 21:36:45 +01:00
Kenzo Martins Matuzawa
8563303004 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.2% (2963 of 3211 strings)

[CI skip]
 2016-02-29 21:36:44 +01:00
Isaac Bennetch
73fd0dc2a8 4.6.0-rc1 pre-release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:56:32 -05:00
Michal Čihař
ed17d3c450 Merge branch 'QA_4_6' into QA_4_6-security 2016-02-29 19:06:23 +01:00
Isaac Bennetch
51a0d2f25a 4.5.5.1 release 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2016-02-29 08:45:21 -05:00
Michal Čihař
2ebabd11fd Merge branch 'QA_4_5' into QA_4_6 2016-02-29 12:13:45 +01:00
Michal Čihař
3c583b86d4 Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security 2016-02-29 12:13:02 +01:00
Michal Čihař
88e0944cfd Honor vendor configuration for gettext inclusion 
Fixes #12048

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-29 12:12:34 +01:00
Michal Čihař
a29f154f37 Merge branch 'MAINT_4_5_5-security' into QA_4_6-security 2016-02-29 10:35:47 +01:00
Michal Čihař
2925d6468b Merge pull request #29 from phpmyadmin/escape 
A better way of escaping
 2016-02-29 10:32:56 +01:00
Madhura Jayaratne
41c4e0214c Fix XSS in zoom search 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 12:26:44 +11:00
Madhura Jayaratne
4650ad7fbd A better way of escaping 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 12:14:46 +11:00
Madhura Jayaratne
cc55f44a4a Fix XSS in Central columns page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 11:12:07 +11:00
Madhura Jayaratne
ab1283e836 Fix XSS in User accounts page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-29 11:08:38 +11:00
Madhura Jayaratne
bcd4ce8cba Fix XSS in normalization.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-27 09:56:12 +11:00
Weblate
19c7a069c7 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-02-26 03:28:05 +01:00