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

100811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Олег Карпов
115ad5e8bb Translated using Weblate (Russian) 
Currently translated at 94.2% (2961 of 3142 strings)

[CI skip]
 2015-07-07 15:53:54 +02:00
Marc Delisle
b0994d0507 Merge pull request #1771 from madhuracj/rfe812 
#812 store export definitions for reuse
 2015-07-07 06:57:14 -04:00
Madhura Jayaratne
4962b46062 Merge branch 'QA_4_4' 
Conflicts:
	themes/original/css/common.css.php
 2015-07-07 15:15:27 +05:30
Madhura Jayaratne
47bda67e38 bug #4976 Timepicker CSS issues in Original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 15:07:20 +05:30
Madhura Jayaratne
8f4e0fda04 Bug - Fix height of the selection box of monitor charts 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 13:06:44 +05:30
Madhura Jayaratne
1a09db082c Add missing icon for original theme 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 12:51:35 +05:30
Madhura Jayaratne
efd5a94b24 Update doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 08:42:22 +05:30
Madhura Jayaratne
44876399fa Fix a missed variable link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 08:31:16 +05:30
Madhura Jayaratne
ebf756b7e3 More variable links fixed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 08:27:11 +05:30
Madhura Jayaratne
0eeace7c4b Another batch of system variable links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 08:20:09 +05:30
Madhura Jayaratne
7788eefb9c Fix links for performance schema variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 07:53:24 +05:30
Madhura Jayaratne
c5aa7af526 Links for optimizer system variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 07:39:47 +05:30
Madhura Jayaratne
bda7f38988 More system variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 07:31:57 +05:30
Madhura Jayaratne
f9eb0b8d20 Fix a broken link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-07 07:13:54 +05:30
Madhura Jayaratne
a3022e8b06 Fix all innodb system variable links 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 22:50:25 +05:30
Madhura Jayaratne
f56254d9b1 More sysvars 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 21:56:35 +05:30
Madhura Jayaratne
14d192a9cd Links for more system variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 21:28:11 +05:30
Madhura Jayaratne
25ffd0e9d5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-06 21:14:57 +05:30
Madhura Jayaratne
34c98115fc Add missing doc links for binlog related variables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 21:13:44 +05:30
Marc Delisle
2c0c5addcb Fix bug due to removed sf.net user argument 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-06 06:57:24 -04:00
Madhura Jayaratne
fd22739220 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 16:11:16 +05:30
Madhura Jayaratne
ef6bb181b7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-06 16:09:29 +05:30
Madhura Jayaratne
ecc886717d Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 
Conflicts:
	ChangeLog
 2015-07-06 16:06:40 +05:30
Marc Delisle
5187c52fee 4.4.11 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-06 06:35:16 -04:00
Madhura Jayaratne
db898fb0b6 bug - Saved chart image does not have a proper name or an extension 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 16:04:17 +05:30
Marc Delisle
a67ba40fba Merge branch 'QA_4_4' 2015-07-06 06:34:12 -04:00
Marc Delisle
daf61e1179 4.4.12-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-06 06:33:38 -04:00
Madhura Jayaratne
989199ee47 bug saved chart image does not have a proper name or an extension 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 15:58:19 +05:30
Madhura Jayaratne
978a1a7cbf All columns listed for xaxis are selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 14:37:34 +05:30
Madhura Jayaratne
69fd08be9c Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-06 13:17:34 +05:30
Madhura Jayaratne
71d6a654e2 Bug - correctly set lock_table directive when repopulating on back button click 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 13:16:11 +05:30
Atul Pratap Singh
5bb0b3dcf3 Add missing class docs 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-06 12:54:59 +05:30
Atul Pratap Singh
ca61c3ace8 Achieve constructor injection usign the introduced DIC 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-06 12:49:19 +05:30
Madhura Jayaratne
c987104160 Make scrutinizer happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 12:09:04 +05:30
Madhura Jayaratne
335f1caf09 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 11:52:32 +05:30
Madhura Jayaratne
0a326a4009 Include empty multiselects 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 11:48:44 +05:30
Madhura Jayaratne
90efc18a70 Include unchecked checboxes (which are ignored by serializeArray()) with null and uncheck them when loading the template 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 11:31:51 +05:30
Madhura Jayaratne
61cbf6b3d9 Submit template form on template change. Select template on Back button 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 08:56:13 +05:30
Isaac Bennetch
f8bd03cecc Merge branch 'QA_4_4' 2015-07-05 22:11:53 -04:00
Isaac Bennetch
937be53dc9 Merge branch 'fix_errors_docs' of https://github.com/devenbansod/phpmyadmin into QA_4_4 2015-07-05 22:11:09 -04:00
Marc Delisle
2c6f5e7efb This variable is needed for multiple db dropping 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-05 17:41:34 -04:00
Atul Pratap Singh
aba718f105 Merge pull request #1758 from gzzhanghao/controller 
WIP: Introduce Controllers
 2015-07-05 22:33:45 +05:30
Deven Bansod
ece5e60ab1 Fixed some spelling mistakes 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-05 19:59:31 +05:30
Marc Delisle
3a92a2812e Merge branch 'QA_4_4' 2015-07-05 06:42:22 -04:00
Marc Delisle
6d4aac0853 bug #4844 FAQ 1.17 needs an update 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-05 06:41:48 -04:00
Marc Delisle
6365442c5e Merge branch 'QA_4_4' 2015-07-04 07:25:06 -04:00
Marc Delisle
ee650720cb bug #4974 Creating a database from console doesn't update navigation panel 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-04 07:24:39 -04:00
Marc Delisle
4a05b4265e Fix code execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-04 06:40:49 -04:00
dingo thirteen
fb71cfa18d Translated using Weblate (Dutch) 
Currently translated at 100.0% (3142 of 3142 strings)

[CI skip]
 2015-07-04 11:08:08 +02:00
Isaac Bennetch
6fc448b967 Merge pull request #1772 from devenbansod/657Correction 
Improvements to Adjust Privileges RFE #657; disables the checkbox when a user lacks sufficient privileges.
 2015-07-03 11:13:56 -04:00