gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,162 Commits 12 Branches 481 Tags 2.4 GiB
581edbbe2e
Commit Graph

100162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
581edbbe2e Merge remote-tracking branch 'origin/master' 2015-06-03 07:24:20 +02:00
Martin Lacina
72acee3407 Translated using Weblate (Slovak) 
Currently translated at 83.5% (2592 of 3103 strings)

[CI skip]
 2015-06-03 07:24:16 +02:00
Madhura Jayaratne
6bb4ba58b4 #4940 Notices in GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-03 10:54:09 +05:30
Isaac Bennetch
c3f01101ab Merge pull request #1712 from devenbansod/701AddComments 
Additional improvements to CSS print view
 2015-06-02 09:45:30 -04:00
Deven Bansod
72ad813750 Added some comments in printview.css. Also few minor fixes. 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-02 21:16:31 +05:30
Madhura Jayaratne
245317503d Enum value editor no longer uses popup_background 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 18:37:02 +05:30
Madhura Jayaratne
53b5f39ce6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-02 18:32:49 +05:30
Madhura Jayaratne
532004654c #4939 Connection input field not hidden when adding a new table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 18:31:37 +05:30
Marc Delisle
8c4eab13ea Merge branch 'QA_4_4' 2015-06-02 08:15:22 -04:00
Marc Delisle
347dc70c18 bug #4908 Reverse proxy: infinite internal redirect (added warning in doc) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-02 08:13:41 -04:00
Marc Delisle
cdb1fc1f68 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-06-02 08:03:11 -04:00
Marc Delisle
f033d02497 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-02 08:03:06 -04:00
Madhura Jayaratne
023b9c688c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-02 17:28:50 +05:30
Madhura Jayaratne
7d85ed44dd Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 17:27:33 +05:30
Stefano Martinelli
d5c62c6008 Translated using Weblate (Italian) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-02 11:56:42 +02:00
Weblate
77f5a593ec Merge remote-tracking branch 'origin/master' 2015-06-02 11:52:16 +02:00
Stefano Martinelli
9a18602129 Translated using Weblate (Italian) 
Currently translated at 99.8% (3102 of 3107 strings)

[CI skip]
 2015-06-02 11:52:12 +02:00
Madhura Jayaratne
e6b4065aee Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:21:56 +05:30
Madhura Jayaratne
d6d016aef9 bug #4936 utf8mb4 fields show only ????s for 4-byte Unicode characters after import 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:20:18 +05:30
Madhura Jayaratne
5b8ce769c8 Merge branch 'QA_4_4' 2015-06-02 14:43:36 +05:30
Weblate
caacfa283e Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-02 11:11:09 +02:00
Burak Yavuz
cd25d32197 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-06-02 11:11:06 +02:00
Benny
2bf74d053d Translated using Weblate (Indonesian) 
Currently translated at 73.4% (2228 of 3035 strings)

[CI skip]
 2015-06-02 11:11:03 +02:00
Madhura Jayaratne
cd2ee14a7c bug #4937 Custom export with backquotes off is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 14:40:25 +05:30
Atul Pratap Singh
14f9cca19f Fix bug#4938: on print, +Indexes link and .sticky_columns remain visible 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-06-02 13:04:24 +05:30
Παναγιώτης Παπάζογλου
3f282edad5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-02 07:21:51 +02:00
Isaac Bennetch
8e8ad11a3c Merge pull request #1711 from devenbansod/701Correction 
Fixed a small error in PR#1708 for RFE#701
 2015-06-01 22:05:20 -04:00
Deven Bansod
359ca5d787 Fixed a small error in PR#1708 for RFE#701 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-02 12:12:56 +05:30
Isaac Bennetch
5c78ad3d95 Changelog for pull request 1708 / RFE 701 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-01 15:00:23 -04:00
Isaac Bennetch
af658d27ee Merge pull request #1708 from devenbansod/rfe701_using_css 
RFE#701 - Print View using CSS - Rewrite
 2015-06-01 14:50:04 -04:00
Madhura Jayaratne
1953235c02 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 17:12:50 +05:30
Madhura Jayaratne
0ff83aa019 Coding style improvements 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 17:11:40 +05:30
Balázs Úr
0896badf9a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-01 13:37:46 +02:00
Madhura Jayaratne
8815a16c41 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 16:03:54 +05:30
Madhura Jayaratne
055f434886 Use PMA_MARIADB constant to identify MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 16:02:41 +05:30
Madhura Jayaratne
1de1cd6c8d Identify MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 16:02:00 +05:30
Marc Delisle
d2ce53d4ae Translated using Weblate (French) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-01 12:06:01 +02:00
Madhura Jayaratne
6249c07c4e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 15:05:34 +05:30
Madhura Jayaratne
bc2d119fcc This is not required. We are already in PMA_Types_Drizzle class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 15:04:20 +05:30
Weblate
85d8b589a3 Merge remote-tracking branch 'origin/master' 2015-06-01 11:32:54 +02:00
Stefano Martinelli
8f51b29c2b Translated using Weblate (Italian) 
Currently translated at 99.6% (3095 of 3107 strings)

[CI skip]
 2015-06-01 11:32:50 +02:00
Madhura Jayaratne
c88478a114 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 15:02:03 +05:30
Madhura Jayaratne
f0c44b29b8 bug #4932 Drizzle version numbers 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 15:01:20 +05:30
Kristjan Räts
f173bdc769 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3107 of 3107 strings)

[CI skip]
 2015-06-01 08:27:09 +02:00
Madhura Jayaratne
d4235da3b8 ChangeLog entry for rfe #1676 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-01 10:06:46 +05:30
Madhura Jayaratne
234e72a582 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-01 10:04:18 +05:30
Weblate
59525a59fa Merge remote-tracking branch 'origin/master' 2015-06-01 06:32:03 +02:00
Benny
4fee24d8fd Translated using Weblate (Indonesian) 
Currently translated at 71.4% (2220 of 3107 strings)

[CI skip]
 2015-06-01 06:31:59 +02:00
Madhura Jayaratne
daa7f50cb0 Merge pull request #1710 from devenbansod/rfe1676 
Allow fetching actual row counts when at least one table has approximate row count
 2015-06-01 10:01:54 +05:30
Deven Bansod
7c37657cc5 RFE#1676 : Actually a Bug 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-01 13:34:15 +05:30