gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,911 Commits 12 Branches 481 Tags 2.4 GiB
2f719fae41
Commit Graph

99911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
2f719fae41 Fix parameter default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 15:16:04 -04:00
Marc Delisle
695e459fed Mention to set the default milestone 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 14:52:53 -04:00
Marc Delisle
64a7ab3c9d bug #4922 "Sort by key" drop-down value is lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 14:34:46 -04:00
Marc Delisle
6c364c8aa7 Merge pull request #1690 from nisargjhaveri/fix_style 
Fix coding style in page settings
 2015-05-22 13:08:01 -04:00
Nisarg Jhaveri
9dfd32317d Fix coding style in page settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 20:20:27 +05:30
Marc Delisle
1fed85ce74 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-22 10:19:44 -04:00
Marc Delisle
2b7e038f94 Initialize variable; improve comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 10:19:23 -04:00
Isaac Bennetch
bc59b8bcf2 Enhanced content for FAQ 6.39 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-05-22 10:14:36 -04:00
Isaac Bennetch
7b69b91431 Merge pull request #1687 from devenbansod/657corrections 
Added Documentation for RFE#657
 2015-05-22 10:10:33 -04:00
Madhura Jayaratne
4354049fde Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 19:04:49 +05:30
Madhura Jayaratne
2fad372299 ChangeLog entry for bug #4918 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 19:02:04 +05:30
Marc Delisle
c9e19e4c1b Merge pull request #1689 from nisargjhaveri/issue_4919 
Fix bug#4919
 2015-05-22 08:55:49 -04:00
Marc Delisle
5b887044d8 Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-22 08:52:34 -04:00
Nisarg Jhaveri
4c8457b778 Fix bug#4919 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 18:13:51 +05:30
Atul Pratap Singh
0e3f4c9200 Merge pull request #1688 from madhuracj/bug4918 
#4918 Date field popup dialog position bug
 2015-05-22 17:35:12 +05:30
Marc Delisle
2d6cfdd700 Merge pull request #1685 from nisargjhaveri/navi_settings 
Navigation panel settings
 2015-05-22 07:57:28 -04:00
Nisarg Jhaveri
9c77ec694e Navigation panel settings 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-22 17:15:03 +05:30
Madhura Jayaratne
6c7ee747b7 #4918 Date field popup dialog position bug 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 14:55:25 +05:30
Madhura Jayaratne
ed824591d1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-22 13:27:26 +05:30
Madhura Jayaratne
05ea446d72 #4917 Changing time with datetime picker gives JS error 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 13:26:29 +05:30
Deven Bansod
d0777581bb Edited the Documentation slightly 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-22 13:26:04 +05:30
Deven Bansod
07e32779de Fixed method Names where they are called 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-22 16:26:31 +05:30
Weblate
a4e887069a Merge remote-tracking branch 'origin/master' 2015-05-22 09:41:39 +02:00
Stefano Martinelli
a415433b9a Translated using Weblate (Italian) 
Currently translated at 99.2% (3077 of 3100 strings)

[CI skip]
 2015-05-22 09:41:37 +02:00
Madhura Jayaratne
aeecb3e370 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 13:11:10 +05:30
Weblate
10045cbf8e Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-22 09:38:33 +02:00
Stefano Martinelli
ef708830e6 Translated using Weblate (Italian) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-22 09:38:30 +02:00
Madhura Jayaratne
1b5f0126f6 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-22 13:08:01 +05:30
Madhura Jayaratne
de8924262e bug Browse foreigners window goes out of the window 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 13:07:17 +05:30
Madhura Jayaratne
7d6b3e5df5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-22 09:57:26 +05:30
Madhura Jayaratne
43fbe8bbb3 rfe #1242 Work with --skip-grant-tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 09:56:08 +05:30
Madhura Jayaratne
63fef03cc7 is_process_priv is no longer used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-22 09:32:36 +05:30
Deven Bansod
bb6dfb840e Added Documentation for RFE#657 
Changed the Label to "Adjust Privileges"

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-05-22 04:45:55 +05:30
Marc Delisle
3f8501fcbb Fix type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 15:41:44 -04:00
Marc Delisle
d248f77458 Fix issues 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 15:03:24 -04:00
Marc Delisle
b3b2360c75 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-21 14:27:39 -04:00
Marc Delisle
8d4f2cb4b0 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-21 14:27:36 -04:00
Atul Pratap Singh
319285f13b Merge pull request #1671 from gzzhanghao/template 
Updates on PMA\Template class
 2015-05-21 23:13:44 +05:30
Jason
be584def3c Fix update-po script 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-05-22 00:05:29 +08:00
Madhura Jayaratne
9ba6455a82 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:07:12 +05:30
Weblate
4e0fe15ae6 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-21 15:36:11 +02:00
Domen
a332f56c96 Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3033 of 3035 strings)

[CI skip]
 2015-05-21 15:36:09 +02:00
Michal Čihař
601443b917 Translated using Weblate (Portuguese) 
Currently translated at 59.1% (1796 of 3035 strings)

[CI skip]
 2015-05-21 15:36:06 +02:00
dingo thirteen
e089d87e8f Translated using Weblate (Dutch) 
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
 2015-05-21 15:36:04 +02:00
Sevdimali İsa
bec047f15d Translated using Weblate (Azerbaijani) 
Currently translated at 58.5% (1777 of 3035 strings)

[CI skip]
 2015-05-21 15:36:02 +02:00
Madhura Jayaratne
0ac438a081 ChangeLog entry for bug #4912 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:05:30 +05:30
Madhura Jayaratne
a59ffb9654 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:04:43 +05:30
Madhura Jayaratne
f1ac39c28d Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-21 19:02:59 +05:30
Madhura Jayaratne
6e69012eb4 #4912 "Highlight pointer" and "Row marker" doesn't work properly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-21 19:01:57 +05:30
Weblate
a84af805ca Merge remote-tracking branch 'origin/master' 2015-05-21 14:55:57 +02:00