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

104593 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
fc8433290b Merge commit 'd98f57b' 2016-01-15 10:08:17 +05:30
Deven Bansod
d98f57bc5b Fix a typo in condition check 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 14:29:46 +05:30
Atul Pratap Singh
0f20dca587 Merge commit '93e1461' 2016-01-15 10:06:24 +05:30
kenan akgün
93e1461e33 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 04:30:18 +01:00
Madhura Jayaratne
32775553df Merge branch 'QA_4_5' 2016-01-15 12:43:41 +11:00
Madhura Jayaratne
516082c3c2 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2016-01-15 12:40:44 +11:00
Madhura Jayaratne
ff967d99b8 Fix #11814 SQL comment and variable stripped from bookmark on save 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 12:40:30 +11:00
Madhura Jayaratne
54e403a624 Merge branch 'QA_4_5' 2016-01-15 10:49:39 +11:00
Weblate
61c7c3018a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-15 00:45:54 +01:00
Stefano Martinelli
4d955255da Translated using Weblate (Italian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-15 00:45:52 +01:00
Madhura Jayaratne
4e05d3981a Fix #11854 Undefined property: stdClass::$releases at version check when disabled in config 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-15 10:45:31 +11:00
Weblate
9f88c18396 Merge remote-tracking branch 'origin/master' 2016-01-14 17:19:15 +01:00
Deven Bansod
0882bc7f6d Fix correct class name. Use namespaces 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-01-15 03:18:27 +05:30
Domen
70c98536de Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3215 of 3216 strings)

[CI skip]
 2016-01-14 17:19:14 +01:00
Stefano Martinelli
ff406d8481 Translated using Weblate (Italian) 
Currently translated at 99.8% (3213 of 3219 strings)

[CI skip]
 2016-01-14 17:19:13 +01:00
Παναγιώτης Παπάζογλου
ef0528b475 Translated using Weblate (Greek) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-14 17:19:12 +01:00
Παναγιώτης Παπάζογλου
23d4eb9078 Translated using Weblate (Greek) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 16:02:19 +01:00
Kristjan Räts
bb71801e6a Translated using Weblate (Estonian) 
Currently translated at 100.0% (3216 of 3216 strings)

[CI skip]
 2016-01-14 13:12:31 +01:00
Marc Delisle
e2fa78df3f Translated using Weblate (French) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-01-14 13:12:04 +01:00
Marc Delisle
0ea7d4a0be Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 13:00:01 +01:00
Kristjan Räts
f49536b798 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 12:53:27 +01:00
Michal Čihař
5cb88f380f Remove excanvas 
It's needed for IE < 9 and we no longer supports that.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:51:53 +01:00
Michal Čihař
0252c13613 Fix class name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:43:57 +01:00
Michal Čihař
ffdba90e9b Fix wrong merge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:31:18 +01:00
Michal Čihař
7411b566f5 Merge branch 'QA_4_5' 2016-01-14 09:17:50 +01:00
Michal Čihař
c63db9eed6 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:17:35 +01:00
Michal Čihař
2edb62ca5d Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:16:14 +01:00
Michal Čihař
ce22861121 Merge branch 'QA_4_5' 2016-01-14 09:14:53 +01:00
Michal Čihař
8ab8b55103 Changelog entry for #11752 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-14 09:14:28 +01:00
Michal Čihař
62b51fa9c7 Merge remote-tracking branch 'origin/QA_4_5' 2016-01-14 09:12:33 +01:00
Michal Čihař
37004337ab Merge commit 'a478437e0ee4d74ec5036cb32e165da002303dd1' 2016-01-14 09:10:43 +01:00
Michal Čihař
14cbfbb84e Merge commit 'd7b3529b992b31b8902680759a3951a081af3ec2' 2016-01-14 09:00:31 +01:00
Weblate
78278c139e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2016-01-14 08:58:57 +01:00
Michal Čihař
42c8d35cf0 Translated using Weblate (Vietnamese) 
Currently translated at 85.9% (2759 of 3210 strings)

[CI skip]
 2016-01-14 08:58:56 +01:00
Marc Delisle
a4883280a0 Translated using Weblate (French) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 08:58:55 +01:00
Erwin Bronkhorst
38c4dc72f2 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3210 of 3210 strings)

[CI skip]
 2016-01-14 08:58:54 +01:00
Michal Čihař
a478437e0e Merge pull request #11832 from devenbansod/fix_11752 
Fix #11752
 2016-01-14 08:58:51 +01:00
Madhura Jayaratne
f2a60e54f4 canvg.js does not seem to be used anymore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 14:05:03 +11:00
Madhura Jayaratne
5adf2eda31 Fix TODO: Generate a random string as the upload_id 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:29:56 +11:00
Madhura Jayaratne
56f684e466 Move common code inside the method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 13:09:55 +11:00
Madhura Jayaratne
78a4d09c6f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-14 12:51:32 +11:00
Madhura Jayaratne
709ab0ce2b Fix TODO: HTML5 "required" property is mostly supported now 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 12:50:19 +11:00
Weblate
b25e716bc9 Merge remote-tracking branch 'origin/master' 2016-01-14 02:49:15 +01:00
Michal Čihař
c79858106b Translated using Weblate (Vietnamese) 
Currently translated at 87.1% (2803 of 3217 strings)

[CI skip]
 2016-01-14 02:49:15 +01:00
Erwin Bronkhorst
901caf4a4d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-14 02:49:12 +01:00
Madhura Jayaratne
126d7b125e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2016-01-14 12:37:58 +11:00
Madhura Jayaratne
c60c33377d Fix TODO: Use finally as it's available in PHP >= 5.5 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-01-14 12:36:18 +11:00
Marc Delisle
dc75d09c12 Translated using Weblate (French) 
Currently translated at 100.0% (3217 of 3217 strings)

[CI skip]
 2016-01-13 12:38:44 +01:00
Michal Čihař
ccd6163563 Add test for getting MySQL locale 
Issue #11789

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:51:56 +01:00
Michal Čihař
cbca7ca202 Show MySQL error messages in user language 
Fixes #11789

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-13 08:49:02 +01:00