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

97727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
7d411677bd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-10 16:10:06 +05:30
Madhura Jayaratne
7a9d9f4f14 rfe #1241 Browse Field -> Search. Also includes cleaning up of code related to the previous implementation at ade942bb09 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 16:08:19 +05:30
Marc Delisle
eca87c132f Clarify function name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-10 02:50:37 -05:00
Marc Delisle
28adbec4d3 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-10 02:46:35 -05:00
Kristjan Räts
97cfe89355 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3010 of 3010 strings)

[CI skip]
 2015-02-10 08:43:59 +01:00
Marc Delisle
c74ed185d4 New icon for Pin text 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-10 02:42:16 -05:00
Madhura Jayaratne
a1cabbbf55 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 11:20:34 +05:30
Madhura Jayaratne
056fa2d7d2 Remove extra column heading in view structure page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 11:18:37 +05:30
Madhura Jayaratne
61afef3632 rfe #937 Relations with views like with tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 10:57:04 +05:30
Madhura Jayaratne
4c8bc68ef1 Simplify the fix for bug #4744 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-10 08:36:00 +05:30
Burak Yavuz
09539d41e6 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3011 of 3011 strings)

[CI skip]
 2015-02-09 19:50:39 +01:00
dingo thirteen
1bb87c6fda Translated using Weblate (Dutch) 
Currently translated at 100.0% (3010 of 3010 strings)

[CI skip]
 2015-02-09 18:30:22 +01:00
Atul Pratap Singh
ae09513aef Merge branch 'QA_4_3' 2015-02-09 22:36:12 +05:30
Weblate
196ae2f0af Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-09 17:53:28 +01:00
mrnonz
90558da372 Translated using Weblate (Thai) 
Currently translated at 35.8% (1070 of 2982 strings)

[CI skip]
 2015-02-09 17:53:26 +01:00
Giovanni Sora
2cac30e1ce Translated using Weblate (Interlingua) 
Currently translated at 63.9% (1906 of 2979 strings)

[CI skip]
 2015-02-09 17:53:24 +01:00
Dadan Setia
24c7e0da8a Translated using Weblate (Indonesian) 
Currently translated at 75.0% (2238 of 2982 strings)

[CI skip]
 2015-02-09 17:53:22 +01:00
Balázs Úr
12f1273232 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2982 of 2982 strings)

[CI skip]
 2015-02-09 17:53:21 +01:00
Michal Čihař
8ba903a3da Translated using Weblate (Arabic) 
Currently translated at 38.3% (1144 of 2981 strings)

[CI skip]
 2015-02-09 17:53:19 +01:00
Atul Pratap Singh
d171e778bc Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-02-09 22:21:28 +05:30
tapanhalani
9e18a571f4 Fix bug#4744-Opening console scroll down the page 
Signed-off-by: tapanhalani <tapanhalani231@gmail.com>
 2015-02-09 22:19:39 +05:30
Marc Delisle
e6bddebf92 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-09 10:49:08 -05:00
Weblate
cccb05edfc Merge remote-tracking branch 'origin/master' 2015-02-09 16:32:48 +01:00
mrnonz
5661cfff54 Translated using Weblate (Thai) 
Currently translated at 35.3% (1064 of 3009 strings)

[CI skip]
 2015-02-09 16:32:45 +01:00
Marc Delisle
00ba48b701 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-09 10:31:52 -05:00
Marc Delisle
6427de300e Merge pull request #1485 from gzzhanghao/master 
New designer menu
 2015-02-09 10:29:56 -05:00
Zhang Hao
6888b4c50b New designer menu 
Signed-off-by: Zhang Hao <jason.daurus@gmail.com>
 2015-02-09 22:04:04 +08:00
Weblate
8d722702a5 Merge remote-tracking branch 'origin/master' 2015-02-09 14:51:28 +01:00
Giovanni Sora
60223b2dd9 Translated using Weblate (Interlingua) 
Currently translated at 64.3% (1937 of 3009 strings)

[CI skip]
 2015-02-09 14:51:26 +01:00
Marc Delisle
9270d08263 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-09 08:51:11 -05:00
Weblate
ddf7c7b009 Merge remote-tracking branch 'origin/master' 2015-02-09 10:23:23 +01:00
Madhura Jayaratne
26dc919e68 rfe #1208 linking from information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 14:53:37 +05:30
Dadan Setia
7605ee0acf Translated using Weblate (Indonesian) 
Currently translated at 74.2% (2233 of 3009 strings)

[CI skip]
 2015-02-09 10:23:19 +01:00
Madhura Jayaratne
8222af3cac Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 13:03:43 +05:30
Madhura Jayaratne
42419588e7 Merge branch 'master' into rfe1235 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 12:55:51 +05:30
Madhura Jayaratne
8403bd6c7e rfe #1235 Relation view: move to main "Structure" page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-09 12:07:43 +05:30
Marc Delisle
2ce55e1053 Merge pull request #1489 from phlyper/patch-2 
update many messages
 2015-02-08 15:17:01 -05:00
Balázs Úr
4db095d736 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3009 of 3009 strings)

[CI skip]
 2015-02-08 20:27:52 +01:00
Burak Yavuz
d53e064ee7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3009 of 3009 strings)

[CI skip]
 2015-02-08 19:53:28 +01:00
Hugues Peccatte
66c3491041 Minor HTML/PHP rewrite. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 16:35:16 +01:00
Hugues Peccatte
5837dba61a Remove unused return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 16:34:51 +01:00
phlyper
c01e272c29 update many messages 2015-02-08 16:20:17 +01:00
Hugues Peccatte
ac315206b8 Merge branch 'addReturn_master' 2015-02-08 16:17:49 +01:00
Hugues Peccatte
7356b58b43 Add missing returns and update unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 14:31:17 +01:00
Marc Delisle
4e6b7aa886 Merge commit 'c293ebf' 2015-02-08 06:55:11 -05:00
Marc Delisle
87e8c53b57 Merge commit '10b5d59' 2015-02-08 06:54:53 -05:00
Marc Delisle
4a35a7fd1c Merge commit '9be24a2' 2015-02-08 06:54:41 -05:00
Weblate
c293ebfb6a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-08 12:53:54 +01:00
mrnonz
b8d47d1ee7 Translated using Weblate (Thai) 
Currently translated at 35.7% (1066 of 2982 strings)

[CI skip]
 2015-02-08 12:53:52 +01:00
worldwideskier
f87dc296a6 Translated using Weblate (Japanese) 
Currently translated at 73.4% (2191 of 2982 strings)

[CI skip]
 2015-02-08 12:53:49 +01:00