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

100305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nisarg Jhaveri
4ca5064aeb Fix tests 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Madhura Jayaratne
d42e05b9f8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-12 17:35:57 +05:30
Madhura Jayaratne
a759ac0185 Bug #4954 Warnings on query results refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 17:33:42 +05:30
Marc Delisle
c289df12cd Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-12 07:35:34 -04:00
Marc Delisle
66a8288c77 Merge pull request #1724 from nisargjhaveri/issue_4948 
Fix bug#4948
 2015-06-12 07:26:54 -04:00
Marc Delisle
44b00e2007 Translated using Weblate (French) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-12 13:02:20 +02:00
Nisarg Jhaveri
d1bb026034 Fix bug#4948 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 12:18:25 +05:30
Weblate
b6a11a1658 Merge remote-tracking branch 'origin/master' 2015-06-12 08:31:55 +02:00
Pedro Ribeiro
1950230fed Translated using Weblate (Portuguese) 
Currently translated at 57.5% (1784 of 3102 strings)

[CI skip]
 2015-06-12 08:31:52 +02:00
Giovanni Sora
697d6cef6c Translated using Weblate (Interlingua) 
Currently translated at 69.5% (2158 of 3102 strings)

[CI skip]
 2015-06-12 08:31:49 +02:00
Michal Čihař
04dec8ba4a Upload files to our file server and CDN as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-12 08:31:30 +02:00
Kristjan Räts
713bda0618 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-12 08:25:08 +02:00
Balázs Úr
4fd1fdae0d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 23:26:03 +02:00
Stefano Martinelli
76608fc1ee Translated using Weblate (Italian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 18:16:45 +02:00
Παναγιώτης Παπάζογλου
f2bb1944ac Translated using Weblate (Greek) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 18:03:49 +02:00
Marc Delisle
20de061c0f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-11 09:31:48 -04:00
Madhura Jayaratne
a36aea3d82 Cosmetic changes to the sample config file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 11:05:03 +05:30
Madhura Jayaratne
1ee8a8f944 Update sample config file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 11:00:12 +05:30
Madhura Jayaratne
96f4e7665e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-11 10:35:59 +05:30
Madhura Jayaratne
29535aa55a Fix variable comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 10:22:24 +05:30
Weblate
51e73e4c92 Merge remote-tracking branch 'origin/master' 2015-06-11 03:17:03 +02:00
Madhura Jayaratne
4aa933e9e3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-11 06:47:02 +05:30
Aputsiaĸ Niels Janussen
f72e5714fa Translated using Weblate (Danish) 
Currently translated at 97.4% (3027 of 3107 strings)

[CI skip]
 2015-06-11 03:17:00 +02:00
Madhura Jayaratne
57d68d53d5 Initialize the positions to 0 when empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 06:45:53 +05:30
Marc Delisle
a069ab24ee Optimize 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 13:31:47 -04:00
Marc Delisle
aed6475fb3 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-06-10 13:27:43 -04:00
Marc Delisle
e1c8b94345 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 13:27:39 -04:00
Madhura Jayaratne
bd911c8658 Using dataSeek should be more efficient 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 22:54:39 +05:30
Madhura Jayaratne
9081189a9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 21:31:06 +05:30
Madhura Jayaratne
4c66580174 Set parameter types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:29:55 +05:30
Madhura Jayaratne
c88da15e88 Update doc blocks with proper types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 21:24:16 +05:30
Atul Pratap Singh
a842973fdf Merge pull request #1718 from gzzhanghao/refactor 
Refactoring tbl_indexes.lib.php & tbl_chart.lib.php
 2015-06-10 20:37:49 +05:30
Madhura Jayaratne
d32a6c2b85 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 20:12:27 +05:30
Madhura Jayaratne
d3d3aac92b Merge branch 'QA_4_4' 2015-06-10 20:11:25 +05:30
Madhura Jayaratne
b47e1ce456 #4953 cant drag sql.gz file onto import input 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 20:09:25 +05:30
Marc Delisle
0740c4b2b6 Clarify variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-10 08:41:48 -04:00
Jason
5bb52eec61 Fix preview sql for creating indexes 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-06-10 19:23:39 +08:00
Madhura Jayaratne
21d74afa1c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-10 09:51:20 +05:30
Madhura Jayaratne
2c5a2e47fd Move print related styles to printview.css 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-10 09:50:10 +05:30
Marc Delisle
0eb78a8ff2 Use strict comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:22:34 -04:00
Marc Delisle
37df4b7715 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 17:08:14 -04:00
Isaac Bennetch
f215ba6e21 ChangeLog for RFE 726 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-09 08:32:49 -04:00
Isaac Bennetch
0a868fb4ba Merge pull request #1699 from devenbansod/rfe726 
RFE#726 - Batch changing column collations
 2015-06-09 08:31:02 -04:00
Weblate
2b19bd55ac Merge remote-tracking branch 'origin/master' 2015-06-09 13:50:25 +02:00
Børge Holm-Wennberg
a37b8fc79c Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.0% (1865 of 3107 strings)

[CI skip]
 2015-06-09 13:50:22 +02:00
Marc Delisle
9e101a407d Fix implicit conversion 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-09 07:50:01 -04:00
Madhura Jayaratne
abc9434cf2 Merge branch 'QA_4_4' 2015-06-09 15:23:28 +05:30
Madhura Jayaratne
8f92d28a45 ChangeLog entry for bug #4951 Trying to save chart as image crashes the browser 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 15:22:36 +05:30
Madhura Jayaratne
f2fd95405c #4951 Trying to save chart as image crashes the browser 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-09 15:21:39 +05:30