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

97519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
f301a058a5 Merge remote-tracking branch 'origin/master' 2015-01-29 11:41:17 +01:00
Giovanni Sora
a328e07e3d Translated using Weblate (Interlingua) 
Currently translated at 63.9% (1923 of 3005 strings)

[CI skip]
 2015-01-29 11:41:14 +01:00
Dadan Setia
b5b510e002 Translated using Weblate (Indonesian) 
Currently translated at 74.3% (2235 of 3005 strings)

[CI skip]
 2015-01-29 11:41:12 +01:00
Madhura Jayaratne
f412f56fd8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-29 16:11:07 +05:30
Madhura Jayaratne
c2a79dc87a #4739 Make index editor work without the Ajax dialog 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-29 16:09:02 +05:30
Kristjan Räts
b7e716d354 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3004 of 3004 strings)

[CI skip]
 2015-01-28 20:44:47 +01:00
Niko Strijbol
69646ba93b Translated using Weblate (Dutch) 
Currently translated at 99.9% (3004 of 3005 strings)

[CI skip]
 2015-01-28 20:02:48 +01:00
Marc Delisle
5556af62a1 Translated using Weblate (French) 
Currently translated at 100.0% (3005 of 3005 strings)

[CI skip]
 2015-01-28 20:02:29 +01:00
dingo thirteen
402be4caf2 Translated using Weblate (Dutch) 
Currently translated at 99.9% (3004 of 3005 strings)

[CI skip]
 2015-01-28 19:52:46 +01:00
Burak Yavuz
b4d7a519fa Translated using Weblate (Turkish) 
Currently translated at 100.0% (3005 of 3005 strings)

[CI skip]
 2015-01-28 19:38:51 +01:00
Marc Delisle
1d71bdc16f Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-28 10:32:58 -05:00
Marc Delisle
db3ca7ec70 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-28 09:07:46 -05:00
Marc Delisle
bdce26898e rfe #1596 Make "Options > Relational" configurable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-28 08:48:17 -05:00
Madhura Jayaratne
20cf74c531 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 17:15:19 +05:30
Madhura Jayaratne
a50fe9d78d Fix 'can't use method return value in write context' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 17:09:09 +05:30
Madhura Jayaratne
c37d2c3f00 Can't use method return value in write context 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 17:04:13 +05:30
Madhura Jayaratne
02df90ac48 Align fields 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 16:54:41 +05:30
Madhura Jayaratne
d6c89793b6 Merge branch 'index' 2015-01-28 16:54:24 +05:30
Madhura Jayaratne
2cb73f2373 Hide extra options in a slider 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 16:47:46 +05:30
Madhura Jayaratne
9714c609eb More options for index creation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 14:47:33 +05:30
Madhura Jayaratne
94dd60d387 Merge branch 'index' 2015-01-28 13:59:34 +05:30
Madhura Jayaratne
acee15bfcf Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 13:55:33 +05:30
Madhura Jayaratne
b4188b0d0b rfe #767 USING BTREE support for HEAP/MEMORY tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 12:54:02 +05:30
Weblate
0733b085a3 Merge remote-tracking branch 'origin/master' 2015-01-28 07:34:23 +01:00
Dadan Setia
881e949f69 Translated using Weblate (Indonesian) 
Currently translated at 74.4% (2230 of 2996 strings)

[CI skip]
 2015-01-28 07:34:20 +01:00
Παναγιώτης Παπάζογλου
09c311e07b Translated using Weblate (Greek) 
Currently translated at 100.0% (2998 of 2998 strings)

[CI skip]
 2015-01-28 07:34:14 +01:00
Madhura Jayaratne
05c5ba753c Distinguish between index type and index choice 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-28 11:50:21 +05:30
Marc Delisle
dcf93b71e1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 15:03:30 -05:00
Marc Delisle
8b737e4cc2 Merge branch 'QA_4_3' 2015-01-27 11:24:34 -05:00
Marc Delisle
b25e20fdbf Bug Undefined index submit_type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 11:24:05 -05:00
Martin Lacina
fee2d29dbb Translated using Weblate (Slovak) 
Currently translated at 83.5% (2504 of 2998 strings)

[CI skip]
 2015-01-27 16:50:18 +01:00
Marc Delisle
f63b1fda03 Translated using Weblate (French) 
Currently translated at 100.0% (2998 of 2998 strings)

[CI skip]
 2015-01-27 16:49:31 +01:00
Burak Yavuz
f76fcfb6bc Translated using Weblate (Turkish) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2015-01-27 14:13:38 +01:00
Marc Delisle
e2daf0f27d Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 07:55:14 -05:00
Marc Delisle
0536c1c8c4 Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 07:54:19 -05:00
Marc Delisle
fb56488d4f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-27 07:49:47 -05:00
Madhura Jayaratne
e15bcf8944 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 15:53:53 +05:30
Madhura Jayaratne
f20406e14d Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-27 15:40:27 +05:30
Madhura Jayaratne
a48ca709f5 bug #4736 Changing display options breaks query highlighting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 15:39:15 +05:30
Madhura Jayaratne
8b2a516070 Add a space between the icon and the text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 14:51:39 +05:30
Madhura Jayaratne
df386c0139 Make 'after' part of the selection 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 14:49:25 +05:30
Madhura Jayaratne
49881aed2e Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 14:27:18 +05:30
Weblate
6d14205992 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-27 09:54:52 +01:00
Madhura Jayaratne
6171c6c8bd bug #4734 Default values for binary fields do not support binary values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 14:24:49 +05:30
Roohan Kazi
e0a63ce104 Translated using Weblate (Hindi) 
Currently translated at 42.6% (1272 of 2980 strings)

[CI skip]
 2015-01-27 09:54:48 +01:00
Atul Pratap Singh
42706c33f7 Merge pull request #1469 from zixtor/master 
rfe #1574 Provide for a database select dropdown in navigation panel as in pre-4.0 versions
 2015-01-27 11:49:41 +05:30
Atul Pratap Singh
fc257c9904 Rename configuration option as ShowDatabasesNavigationAsTree with default true 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 11:31:03 +05:30
Atul Pratap Singh
cf3c433a9d Fix failing tests 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-01-27 10:42:24 +05:30
Weblate
6dc3a1fc1f Merge remote-tracking branch 'origin/master' 2015-01-27 05:13:39 +01:00
Roohan Kazi
23531d2cb5 Translated using Weblate (Hindi) 
Currently translated at 42.3% (1266 of 2988 strings)

[CI skip]
 2015-01-27 05:13:34 +01:00