gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,172 Commits 12 Branches 481 Tags 2.4 GiB
87f0b976b1
Commit Graph

91172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
87f0b976b1 Merge commit 'b0283f1' 2014-03-30 09:52:14 -04:00
Marc Delisle
76b132e5fd Merge commit 'c164234' 2014-03-30 09:52:01 -04:00
Marc Delisle
b0283f1480 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-30 09:50:00 -04:00
drainx
a6a2b3d698 Actually display sent traffic per hour 
Bytes sent was commented out when viewing the element. This should remove the cause of said commenting.

Signed-off-by: Daniel Rix <drainx1@live.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-30 09:48:45 -04:00
Marc Delisle
d0581b630f Update po files 2014-03-30 09:46:00 -04:00
Marc Delisle
06a2a5377e Improve message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-30 09:45:27 -04:00
Marc Delisle
5c0b5413ca Merge pull request #1119 from Tithugues/help4319 
Add message to warn the user if a form has too many fields.
 2014-03-30 09:40:39 -04:00
Ann + J.M
356f306e6c Add missing space behind container icons after 4d8ddaf 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 22:46:43 +01:00
Ann + J.M
149aad02da Reset favorite dropdown when selecting "There are no .." 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 22:26:42 +01:00
Ann + J.M
50ce95f974 Fix failing test PMA_ConfigFile_Test::testGetServerDSN after b870612 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 21:47:32 +01:00
Weblate
c1642343cd Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-29 21:36:37 +01:00
Magnus Vinsjevik
83faf048d3 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.8% (1838 of 2750)
 2014-03-29 21:36:36 +01:00
Yungu Kim
0c0f0ce0b3 Translated using Weblate (Korean) 
Currently translated at 78.1% (2148 of 2750)
 2014-03-29 21:36:34 +01:00
Ann + J.M
11d88c3172 Finish 4345-privs-dbname-underscore-backslashes 2014-03-29 21:35:49 +01:00
Ann + J.M
16dadc1145 Finish 4345-privs-dbname-underscore-backslashes 2014-03-29 21:35:16 +01:00
Ann + J.M
c6e450a566 Add ChangeLog entry for bug #4345 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 21:34:27 +01:00
Ann + J.M
ea50288fca Fix #4345 Privileges editor shows databases with underscore backslash-escaped 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 21:34:08 +01:00
Ann + J.M
b870612ba7 Hard-code mysqli extension in setup DSN 
Follow-up to removing extension directive in 2a8962a

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 20:59:06 +01:00
Ann + J.M
356626bbaa [interface] Highlight active left menu item in setup 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 20:45:49 +01:00
Ann + J.M
2714cdce1c [setup] Localize sBlowfishSecretMsg 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 20:17:12 +01:00
Ann + J.M
3c7f840dfc List correct $cfg[..][savedsearches] param 
Remove _ sign to fix warning in setup screen

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-03-29 20:00:40 +01:00
Weblate
ce15d293e2 Merge remote-tracking branch 'origin/master' 2014-03-29 19:38:41 +01:00
Chanaka Indrajith
a2caec9cc6 Remove unused parameters 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-03-30 00:10:31 +05:30
Magnus Vinsjevik
868736e4cd Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.3% (1645 of 2770)
 2014-03-29 19:38:38 +01:00
Yungu Kim
c181568dc1 Translated using Weblate (Korean) 
Currently translated at 73.9% (2049 of 2770)
 2014-03-29 19:38:36 +01:00
Hugues Peccatte
eac47b0775 Correct warning message. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-29 18:54:54 +01:00
Chanaka Indrajith
d27bbe6f9d Fixed naming convention for private method makeURL 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-03-29 23:04:14 +05:30
Chanaka Indrajith
4071c6eaa6 Remove unused parameters in _getSortingUrlParams() function 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-03-29 22:52:39 +05:30
Chanaka Indrajith
60e33b5a59 Fixed some code violations 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-03-29 22:41:43 +05:30
Hugues Peccatte
287d08c826 Add message to warn the user if a form has too many fields. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-03-29 17:04:42 +01:00
Weblate
60277d8d38 Merge remote-tracking branch 'origin/master' 2014-03-29 12:39:33 +01:00
Magnus Vinsjevik
fbbe9af6ab Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.3% (1644 of 2770)
 2014-03-29 12:39:31 +01:00
Marc Delisle
ea4e18ba84 Merge branch 'QA_4_1' 2014-03-29 07:38:54 -04:00
Marc Delisle
4e99fd3f9f Merge commit '0b75d06' 2014-03-29 07:38:45 -04:00
Weblate
91871fb6ba Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-03-29 12:38:10 +01:00
Michal Čihař
a4bf6e532d Translated using Weblate (Polish) 
Currently translated at 92.5% (2544 of 2750)
 2014-03-29 12:38:07 +01:00
Michal Čihař
9dc6df769d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.7% (1836 of 2750)
 2014-03-29 12:38:05 +01:00
Michal Čihař
ece698b0c9 Translated using Weblate (Interlingua) 
Currently translated at 42.4% (1168 of 2750)
 2014-03-29 12:38:03 +01:00
Marc Delisle
b87c3ea29a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-29 07:37:39 -04:00
Viduranga Wijesooriya
4f3f738241 bug-#4336 fixed list server styles 
Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-29 07:34:53 -04:00
Weblate
7f56ba8137 Merge remote-tracking branch 'origin/master' 2014-03-28 22:03:49 +01:00
Marc Delisle
53b0fa631d Translated using Weblate (French) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-28 22:03:46 +01:00
Marc Delisle
2caa7816ce Merge pull request #1117 from ashutoshdhundhara/favorite_table_bug 
Minor Bug fix for favorite icon.
 2014-03-28 17:03:41 -04:00
Ashutosh Dhundhara
514a24e4aa Minor Bug for favorite icon. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 01:58:26 +05:30
Marc Delisle
ee3ca2b612 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-28 15:45:13 -04:00
Panagiotis Papazoglou
92f0ce0552 Translated using Weblate (Greek) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-28 20:22:32 +01:00
Weblate
4e10c2ecd3 Merge remote-tracking branch 'origin/master' 2014-03-28 19:48:00 +01:00
Kristjan Räts
0009a020d9 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-03-28 19:47:57 +01:00
Marc Delisle
0e13fc74a2 Merge pull request #1115 from ashutoshdhundhara/favorite_table 
Favorite tables feature using Ajax.
 2014-03-28 14:47:55 -04:00
Ashutosh Dhundhara
e9d59fd7e0 Implemented Favorite tables feature with Ajax. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fixes in Settings->Features page and Navigation Header class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed translation issues in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fixed error in RecentFavoriteTable class.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Another fix in structure.lib.php.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-03-29 00:06:14 +05:30