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

97484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Madhura Jayaratne
84325103cc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-27 09:43:02 +05:30
Madhura Jayaratne
36f50c3392 #4735 Floating menu bar appears on top of jQuery dialogs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-27 09:42:05 +05:30
Marc Delisle
9f25a3a560 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-26 09:51:37 -05:00
Marc Delisle
cf9b0aa1e7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-26 07:41:07 -05:00
Weblate
a97691f922 Merge remote-tracking branch 'origin/master' 2015-01-26 12:44:27 +01:00
Jan Erik Zassenhaus
f29b12ecf0 Translated using Weblate (German) 
Currently translated at 99.8% (2985 of 2988 strings)

[CI skip]
 2015-01-26 12:44:22 +01:00
Madhura Jayaratne
34cadf6aed Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 17:14:21 +05:30
Madhura Jayaratne
761a53ac0a Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-26 17:11:30 +05:30
Weblate
963673e7d4 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-26 12:41:28 +01:00
Jan Erik Zassenhaus
aefcb1ea75 Translated using Weblate (German) 
Currently translated at 100.0% (2979 of 2979 strings)

[CI skip]
 2015-01-26 12:41:23 +01:00
Madhura Jayaratne
c91a28be51 bug #4729 Display original field when using "Relational display column" option and display column is empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 17:10:44 +05:30
Madhura Jayaratne
7f9082fd95 Merge branch 'QA_4_3' 2015-01-26 15:37:10 +05:30
Weblate
68e10e8973 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-26 11:05:13 +01:00
Martin Lacina
4e946c1f2b Translated using Weblate (Slovak) 
Currently translated at 83.5% (2490 of 2979 strings)

[CI skip]
 2015-01-26 11:05:09 +01:00
Madhura Jayaratne
a8e0f35ef7 bug #4730 Notice while browsing tables when phpmyadmin pma database exists, but not all the tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 15:35:05 +05:30
Valter Georgiev
dca65beaa1 Translated using Weblate (Bulgarian) 
Currently translated at 62.7% (1871 of 2980 strings)

[CI skip]
 2015-01-26 11:05:05 +01:00
Weblate
78390b5d0f Merge remote-tracking branch 'origin/master' 2015-01-26 09:52:20 +01:00
Martin Lacina
b02db4bf35 Translated using Weblate (Slovak) 
Currently translated at 83.5% (2496 of 2988 strings)

[CI skip]
 2015-01-26 09:52:16 +01:00
Valter Georgiev
86401c4a0a Translated using Weblate (Bulgarian) 
Currently translated at 62.5% (1869 of 2988 strings)

[CI skip]
 2015-01-26 09:52:11 +01:00
Madhura Jayaratne
4dc0f8e613 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-26 14:22:01 +05:30
Madhura Jayaratne
8b1f6eccd2 Fix some failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 14:07:50 +05:30
Madhura Jayaratne
078eaea916 Add ChangeLog entry 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 13:08:37 +05:30
Madhura Jayaratne
29815e644e Browser transformation for some of the SHOW statements 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 13:07:29 +05:30
Madhura Jayaratne
112099971b Remove redundant check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 12:27:14 +05:30
Madhura Jayaratne
c7ebfd4478 Organize the code. Adhere to hide_browser_transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 12:22:15 +05:30
Madhura Jayaratne
19acb28444 Browser transformation and links for mysql and information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-26 11:56:51 +05:30
Madhura Jayaratne
bfd0a67845 Do not link to itself 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-25 17:59:03 +05:30
Marc Delisle
f5e74f72cc Merge commit '6fb1b43' 2015-01-25 07:04:07 -05:00
Marc Delisle
07e6c40368 Merge commit '264b66c' 2015-01-25 07:03:50 -05:00
Marc Delisle
d830605fb0 Merge commit 'e8f7475' 2015-01-25 07:03:38 -05:00
Weblate
6fb1b43c14 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-25 13:02:28 +01:00
Jozef Pistej
33ef6cc85c Translated using Weblate (Slovak) 
Currently translated at 83.5% (2490 of 2979 strings)

[CI skip]
 2015-01-25 13:02:25 +01:00
Sevdimali İsa
930d04bd62 Translated using Weblate (Azerbaijani) 
Currently translated at 53.1% (1584 of 2982 strings)

[CI skip]
 2015-01-25 13:02:21 +01:00
Marc Delisle
264b66c6c7 bug #4728 Incorrect headings in routine editor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-25 07:02:01 -05:00
Weblate
3debe31abe Merge remote-tracking branch 'origin/master' 2015-01-25 11:38:06 +01:00