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

92448 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yungu Kim
fd1a81cc29 Translated using Weblate (Korean) 
Currently translated at 79.2% (2194 of 2768)
 2014-05-11 06:24:10 +02:00
Weblate
2b441ff157 Merge remote-tracking branch 'origin/master' 2014-05-10 20:45:33 +02:00
Edie Johnny
32cda86b07 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-10 20:45:30 +02:00
Michal Čihař
ca90d760dd Simplify coveralls settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 20:45:22 +02:00
Michal Čihař
8f45363f66 Merge branch 'QA_4_2' 2014-05-10 17:35:59 +02:00
Michal Čihař
b177557c11 Use preg_quote instead of home made replacement to quote string for preg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:35:49 +02:00
Michal Čihař
8496dfde6c Correctly pass empty parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:23:07 +02:00
Michal Čihař
9819d9bc75 Correctly pass empty parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:22:30 +02:00
Michal Čihař
66f3041651 Fix privileges rendering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:21:28 +02:00
Michal Čihař
28a278f113 Fix param name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:20:25 +02:00
Michal Čihař
38e8bc7c29 Fix default value for matching 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:15:54 +02:00
Michal Čihař
2f4e53e781 Iternal error is an error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:07:17 +02:00
Michal Čihař
fb1db9f21b Use correct variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:06:31 +02:00
Michal Čihař
450106d83f Simplify params to _findTreeMatch 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:00:38 +02:00
Michal Čihař
32f32f45a5 Pass missing parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 16:59:17 +02:00
Michal Čihař
0a8dcc5dff Detect internal error (like too many error messages) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 16:53:23 +02:00
Marc Delisle
c9d93bb583 Merge commit 'f1712b2' 2014-05-10 16:18:13 +02:00
Marc Delisle
75ef5f4441 Merge commit '1440044' 2014-05-10 16:18:03 +02:00
Marc Delisle
77d1cb5185 Merge commit '3e4561f' 2014-05-10 16:17:07 +02:00
Marc Delisle
f1712b2492 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 16:16:03 +02:00
Marc Delisle
1440044119 Merge pull request #1168 from D-storm/bug-4389 
bug-4389 Null checkbox covering data input when editing
 2014-05-10 16:14:35 +02:00
Michal Čihař
bfafee8b62 Upgrade tcpdf to 6.0.077 
6.0.077 (2014-05-06)
	- A Datamatrix barcode bug was fixed.

6.0.076 (2014-05-06)
	- A bug in Datamatrix Base256 encoding was fixed.
	- Merged fix for SVG use/clip-gradient.
	- Now it is possible to prefix a page number in Link methods with the * character to avoid been changed when adding/deleting/moving pages (see example_045.php).

6.0.075 (2014-05-05)
	- Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.

6.0.074 (2014-05-03)
	- Part of Bug #917 "Using realtive Units like ex or em for images distort output in HTML mode" was fixed.
	- Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.

6.0.073 (2014-04-29)
	- Bug #913 "Possible bug with line-height" was fixed.
	- Bug #914 "MultiCell and FitCell" was fixed.
	- Bug #915 "Problem with SVG Image using Radial Gradients" was fixed.

6.0.072 (2014-04-27)
	- Deprecated curly braces substring syntax was replaced with square braces.

6.0.071 (2014-04-25)
	- Bug #911 "error with buffered png pics" was fixed.

6.0.070 (2014-04-24)
	- Bug #910 "An SVG image is being cut off (with clipping mask) when you use align options" was fixed.

6.0.069 (2014-04-24)
	- Datamatrix Base256 encoding was fixed.

6.0.068 (2014-04-22)
	- Some Datamatrix barcode bugs were fixed.

6.0.067 (2014-04-21)
	- startLayer() method signature was changed to include a new "lock" parameter.

6.0.066 (2014-04-20)
	- Bug #908 "Linebreak is not considered when getting length of the next string" was fixed.

6.0.065 (2014-04-10)
	- Bug #905 "RGB percentage color bug in convertHTMLColorToDec()" was fixed.

6.0.064 (2014-04-07)
	- Header and Footer fonts are now set by default.
	- Bug #904 "PDF corrupted" was fixed.

6.0.063 (2014-04-03)
	- Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 16:07:10 +02:00
Michal Čihař
3084c9f1c8 Share code for formatting privilege 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 15:46:48 +02:00
Michal Čihař
612002d9b2 Share code for processing table privileges 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 15:46:43 +02:00
Michal Čihař
3c4d1970af Do not pass string as default value instead of array 
Null is better fallback value

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 15:46:28 +02:00
Michal Čihař
a0beac1a26 We do not care about phpgettext tests, these are external 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 15:27:52 +02:00
Michal Čihař
329deddbfd Let's have just one PMA_mimeDefaultFunction 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:53:49 +02:00
Michal Čihař
2be24a07ff Show Swekey example in the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:46:01 +02:00
Michal Čihař
4b0dedbdbf Merge remote-tracking branch 'origin/QA_4_2' 2014-05-10 14:37:22 +02:00
Robert Readman
31d8c7e0ca Translated using Weblate (English (United Kingdom)) 
Currently translated at 89.7% (2484 of 2768)
 2014-05-10 14:37:00 +02:00
Michal Čihař
86e0fc6fdb Use our own coding standard 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:21:43 +02:00
Madhura Jayaratne
04dc16e1fc Fix long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:33:15 +02:00
Madhura Jayaratne
0b580f20c6 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:24:52 +02:00
Madhura Jayaratne
16ddc78df8 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:21:41 +02:00
Madhura Jayaratne
af857f33bc Fix parameter name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:19:06 +02:00
Madhura Jayaratne
f487813356 Remove sperfluous doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:17:29 +02:00
Madhura Jayaratne
9079749206 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:12:03 +02:00
Madhura Jayaratne
288c012128 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:05:12 +02:00
Madhura Jayaratne
348c51a5a3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 13:03:11 +02:00
Madhura Jayaratne
a5d0b1196c Fix yet another typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:55 +02:00
Madhura Jayaratne
553000a423 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:22 +02:00
Madhura Jayaratne
839094612a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:00:26 +02:00
Marc Delisle
277c0c57db Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:58:37 +02:00
Marc Delisle
15f42ca8c6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:55:41 +02:00
Marc Delisle
d12d752c8c Merge pull request #1171 from ashutoshdhundhara/rfe_1445 
RFE: #1445 Easy access to "SHOW CREATE".
 2014-05-10 12:54:27 +02:00
Michal Čihař
71c0eba99f Add test for NavigationTree::renderPath 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:48:16 +02:00
Michal Čihař
b8a879cef2 Document when the function is called 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:09:08 +02:00
Madhura Jayaratne
c93a2f8c0f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 12:06:19 +02:00
Madhura Jayaratne
d0fd5acc0f Revert 33a30ad7ae. Those funcitons are infact used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 12:04:36 +02:00
Michal Čihař
cff38db7f2 Share code for rending correct page after export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:02:39 +02:00