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

92602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
2bfffa181b Merge commit 'a941632' 2014-05-18 13:54:09 -04:00
Marc Delisle
5a18dda9e1 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:32:54 -04:00
Marc Delisle
39c181ca1e Merge branch 'QA_4_2' 2014-05-18 13:23:16 -04:00
Marc Delisle
85bc719837 Merge commit 'ec9f73c' 2014-05-18 13:23:08 -04:00
Weblate
a941632ad8 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 19:22:58 +02:00
Yungu Kim
0780e97f3b Translated using Weblate (Korean) 
Currently translated at 81.1% (2247 of 2768)
 2014-05-18 19:22:55 +02:00
Marc Delisle
e813cab608 bug #4418 When copying databases, primary key attributes get lost 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-18 13:22:14 -04:00
Weblate
ad81be128a Merge remote-tracking branch 'origin/master' 2014-05-18 18:13:41 +02:00
Yungu Kim
9b2d55d663 Translated using Weblate (Korean) 
Currently translated at 81.1% (2249 of 2772)
 2014-05-18 18:13:37 +02:00
Hugues Peccatte
cc9460e798 Update PHPDoc. 
Add missing initialisation.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-18 18:13:17 +02:00
Hugues Peccatte
9dd5c4ca6e Fix typo in PHP variable. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-18 14:38:46 +02:00
Hugues Peccatte
81c3916485 Fix scrutinizer JS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-18 13:57:41 +02:00
Madhura Jayaratne
22e3a0d19f Fix some coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-18 14:44:10 +05:30
Madhura Jayaratne
f79ab273a2 Merge branch 'QA_4_2' 2014-05-18 14:16:16 +05:30
Weblate
ec9f73c4b5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-18 10:44:05 +02:00
Rahoz Yaseen
47399d82fd Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.9% (496 of 2768)
 2014-05-18 10:44:02 +02:00
Madhura Jayaratne
117490393a Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Conflicts:
	ChangeLog
 2014-05-18 14:11:56 +05:30
Madhura Jayaratne
33343fbdf4 bug #4398 Monitor should fit into screen width 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-18 14:09:51 +05:30
Michal Čihař
82ff185f39 Merge pull request #1186 from D-storm/scrutinizer 
documentation & coding style issues fix
 2014-05-18 09:44:09 +02:00
Chirayu Chiripal
fed689c7e1 documentation & coding style issues fix 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-18 12:38:49 +05:30
Chanaka Indrajith
14b0de501c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-18 00:16:51 +05:30
Chanaka Indrajith
39b5f07dfb Fixed some documentation issues raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-18 00:14:27 +05:30
Chanaka Indrajith
52bf8f03ed Fixed coding style issue in inser_edit.lib.php file, raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 23:43:46 +05:30
Weblate
df310df1e5 Merge remote-tracking branch 'origin/master' 2014-05-17 20:10:16 +02:00
Rahoz Yaseen
4d3795e37a Translated using Weblate (Kurdish Sorani) 
Currently translated at 17.8% (496 of 2771)
 2014-05-17 20:10:13 +02:00
Chanaka Indrajith
4b92e65d01 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-17 18:40:01 +05:30
Chanaka Indrajith
cf6a8ce4e1 Fixed documentation issue related to argument type mismatching in ImportCsv.class.php file, raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 18:11:10 +05:30
Chanaka Indrajith
7c88895d99 Fixed documentation issue related to argument type mismatching in create_addfield.lib.php file raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 17:27:12 +05:30
Chanaka Indrajith
2dfdf472a0 Fixed documentation issue related to argument type mismatching, raised by scrutinizer 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-05-17 17:19:12 +05:30
Marc Delisle
5574368089 Merge branch 'QA_4_2' 2014-05-17 07:40:49 -04:00
Marc Delisle
77a0d39790 Merge commit '41c8f76' 2014-05-17 07:40:36 -04:00
Marc Delisle
2986cdcd8a bug #4419 No more calendar into search tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-17 07:39:04 -04:00
Marc Delisle
b35e4efee1 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-17 06:10:14 -04:00
Weblate
79f3057ce1 Merge remote-tracking branch 'origin/master' 2014-05-17 09:39:35 +02:00
Sorawee Porncharoenwase
c387bf234a Translated using Weblate (Thai) 
Currently translated at 38.5% (1069 of 2772)
 2014-05-17 09:39:32 +02:00
Weblate
41c8f76eeb Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-17 09:38:53 +02:00
Sorawee Porncharoenwase
a0140e7aae Translated using Weblate (Thai) 
Currently translated at 38.6% (1069 of 2768)
 2014-05-17 09:38:50 +02:00
Hugues Peccatte
81cd594ea4 ChangeLog entry 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-17 07:39:09 +02:00
Hugues Peccatte
a0397557fc ChangeLog entry 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-17 07:38:17 +02:00
Marc Delisle
f5e76d1b1d Merge branch 'QA_4_2' 2014-05-16 12:36:52 -04:00
Marc Delisle
52cf4a6491 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 12:36:18 -04:00
Petr Tomášek
99dca5d7a6 Respect ['ShowCreateDb'] in the navi panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 12:35:28 -04:00
Marc Delisle
0e483804ff Merge commit 'e2817df' 2014-05-16 12:21:30 -04:00
Marc Delisle
49f1bdd822 Merge commit '0ee881d' 2014-05-16 12:20:52 -04:00
Marc Delisle
ffe8277a2e Merge commit '0dbbab8' 2014-05-16 12:20:38 -04:00
Marc Delisle
152ed86bad Merge commit '0d4d696' 2014-05-16 12:20:25 -04:00
Domen
0da801575e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-16 17:17:55 +02:00
Marc Delisle
e2817dfdfd Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-16 09:56:52 -04:00
Marc Delisle
0ee881da71 bug #4395 BLOB link transformation is broken 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 09:56:47 -04:00
Isaac Bennetch
0dbbab8fdc Merge pull request #1169 from D-storm/bug-4392 
Bug #4392: Cannot see databases in nav panel on databases grouping when ...
 2014-05-16 09:54:43 -04:00