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

97972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugues Peccatte
e669cb4708 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-22 22:52:35 +01:00
Hugues Peccatte
4846ef6bf7 Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 22:51:12 +01:00
Balázs Úr
22045d341f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3019 of 3019 strings)

[CI skip]
 2015-02-22 22:50:07 +01:00
Marc Delisle
8a68634707 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:47 -05:00
Marc Delisle
17c9592f3c Use standard backquote method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 16:03:08 -05:00
Marc Delisle
d2de03ebbe Use shorter operator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:58:25 -05:00
Marc Delisle
5a8208f67c ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 15:54:10 -05:00
Marc Delisle
e71496dc84 Merge pull request #1508 from devenbansod/feat-req-1606 
Adding Filter Process List | Feature #1606
 2015-02-22 15:52:31 -05:00
Hugues Peccatte
52bfc94d74 Update PHPDoc. 
Fix typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-22 20:03:32 +01:00
Deven Bansod
42d5a90f2f Add Filter to Process List | Feature #1606 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-02-22 22:52:47 +05:30
Marc Delisle
c132f6697b Merge branch 'QA_4_3' 2015-02-22 08:34:52 -05:00
Marc Delisle
5bf0dd4de1 Merge commit 'e835710' 2015-02-22 08:34:45 -05:00
Marc Delisle
efbfe9a0b4 bug #4768 MariaDB: version mismatch 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 08:33:18 -05:00
Weblate
8ab3daca44 Merge remote-tracking branch 'origin/master' 2015-02-22 13:52:40 +01:00
JongDeok
013de65c48 Translated using Weblate (Korean) 
Currently translated at 81.4% (2452 of 3012 strings)

[CI skip]
 2015-02-22 13:52:37 +01:00
Marc Delisle
3e8ed57470 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-22 07:52:26 -05:00
Koo Young Min
e1944a45a6 Translated using Weblate (Korean) 
Currently translated at 81.3% (2451 of 3012 strings)

[CI skip]
 2015-02-21 19:46:07 +01:00
Koo Young Min
e835710fac Translated using Weblate (Korean) 
Currently translated at 82.8% (2471 of 2982 strings)

[CI skip]
 2015-02-21 19:45:56 +01:00
Atul Pratap Singh
0697b0b859 Merge commit '0abfb99' 2015-02-21 22:46:55 +05:30
Atul Pratap Singh
5896a3851b Merge commit 'd100ef0' 2015-02-21 22:46:42 +05:30
Marc Delisle
127ba15547 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-21 07:18:38 -05:00
Marc Delisle
cf8b3330d3 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-21 07:18:26 -05:00
Weblate
64f71a769a Merge remote-tracking branch 'origin/master' 2015-02-21 13:17:22 +01:00
Masahiko HISAKAWA
ddd387b51f Translated using Weblate (Japanese) 
Currently translated at 73.0% (2199 of 3012 strings)

[CI skip]
 2015-02-21 13:17:19 +01:00
Marc Delisle
f97925d2e9 Merge pull request #1514 from gzzhanghao/autocomplete 
rfe #1595 make professional code editor suggestion
 2015-02-21 07:17:11 -05:00
Zhang Hao
2cc8a9ce3b rfe #1595 make professional code editor suggestion 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-21 16:27:31 +08:00
Atul Pratap Singh
0abfb99e88 Directly use decodeURIComponent 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-21 01:10:42 +05:30
Atul Pratap Singh
11638d3559 Fix bug#4774 SQL links are completely wrong 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-21 00:53:47 +05:30
Marc Delisle
9f4a2b15a4 4.3.10 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-20 07:46:04 -05:00
Marc Delisle
03c2333cf4 Merge branch 'QA_4_3' 2015-02-20 07:45:25 -05:00
Weblate
d100ef07fa Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-20 13:45:17 +01:00
Sevdimali İsa
1ba4c59e80 Translated using Weblate (Azerbaijani) 
Currently translated at 54.0% (1613 of 2982 strings)

[CI skip]
 2015-02-20 13:45:15 +01:00
Marc Delisle
06d6158104 4.3.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-20 07:44:57 -05:00
Madhura Jayaratne
a54da2052b Preserve tab order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 18:06:17 +05:30
Madhura Jayaratne
c35373e8aa Track view link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:53:49 +05:30
Madhura Jayaratne
7a95986644 Show milliseconds as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:17:39 +05:30
Madhura Jayaratne
2970056de6 Display actual datetime and pad the value with zeros when using calendar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 16:20:05 +05:30
Madhura Jayaratne
1a13a5e48d Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:57:52 +05:30
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:53:54 +05:30
Madhura Jayaratne
805679626a rfe #685 Editor for HTML content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:41:56 +05:30
Madhura Jayaratne
de8da9da5f More sub package corrections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:16:47 +05:30
Madhura Jayaratne
e262ca22a2 Use proper sub packages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:15:18 +05:30
Madhura Jayaratne
06a95a425c Escape special chars 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:56:55 +05:30
Madhura Jayaratne
a3e3508e42 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-20 10:42:42 +05:30
Madhura Jayaratne
b7b865a248 Simplify editors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:41:49 +05:30
Atul Pratap Singh
9f04b27b51 Merge pull request #1513 from smita786/master 
fix bug #4772 and other similar issues
 2015-02-20 00:48:41 +05:30
Smita Kumari
daf6d1e7d8 fix bug #4772 and other similar issues 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-02-20 00:23:07 +05:30
Weblate
c1da27fe74 Merge remote-tracking branch 'origin/master' 2015-02-19 19:47:42 +01:00
Sevdimali İsa
49d37bfc8c Translated using Weblate (Azerbaijani) 
Currently translated at 52.9% (1595 of 3012 strings)

[CI skip]
 2015-02-19 19:47:37 +01:00
Smita Kumari
0feeebf98c Merge pull request #1512 from smita786/master 
enum editor and pick from central column dialogues were going out of screen
 2015-02-20 00:17:33 +05:30