gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,589 Commits 12 Branches 481 Tags 2.4 GiB
ac091e36d5
Commit Graph

88589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ac091e36d5 Update po files 2013-12-27 10:58:38 -05:00
J.M
480f663bd8 Fix #4205 Add user shows "edit user group" link 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-27 16:50:19 +01:00
J.M
02ced8271f Add ChangeLog entry for bug #4205 2013-12-27 16:48:07 +01:00
J.M
62cf9008b5 Fix server privileges Action colspan (usergroups) 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-27 16:47:45 +01:00
J.M
f16f97830a Hide Edit user group link when no groups defined 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-27 16:46:55 +01:00
J.M
6ce9951f6c Rename local variables in PMA_getTableBodyForUserRightsTable function 
(no camel-case in variable names)

Signed-off-by: J.M <me@mynetx.net>
 2013-12-27 16:44:37 +01:00
J.M
22bf28e9ce Extract PMA_getUserGroupCount helper function 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-27 16:40:41 +01:00
Weblate
ec89925146 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-27 16:08:20 +01:00
Chien Wei Lin
d2d3c19c70 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-27 16:07:23 +01:00
Marc Delisle
9951278eb3 Merge branch 'QA_4_1' 2013-12-27 10:05:37 -05:00
Marc Delisle
8782c1c5b8 bug #4131 Import: "number of rows to skip" is ambiguous 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 10:04:55 -05:00
Marc Delisle
d23e1575e3 Move ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 09:10:43 -05:00
Hugues Peccatte
4f05a8abfa Merge pull request #808 from Tithugues/nestedLevels 
Nested levels
 2013-12-27 05:33:10 -08:00
Hugues Peccatte
ef49eff205 Standardize names of functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-27 13:49:57 +01:00
Marc Delisle
8b8b2cf302 Missing message after refactoring 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 07:37:13 -05:00
Marc Delisle
630ca4f6d8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-27 07:28:19 -05:00
Marc Delisle
b78ff4442e Refactor: new PMA_openExportFile() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 07:27:48 -05:00
Weblate
6d95272b88 Merge remote-tracking branch 'origin/master' 2013-12-27 12:22:35 +01:00
Chien Wei Lin
932a16df4f Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-27 12:16:39 +01:00
Atul Pratap Singh
435739e95a Avoid error if event handler's teardown didn't happen 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-27 20:07:46 +05:30
Marc Delisle
77625d0bf3 Unused code, now that JavaScript is mandatory; export can no longer be requested as text if the format does not allow it 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-27 06:11:16 -05:00
Hugues Peccatte
bf3ce05675 Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-26 21:06:19 +01:00
Marc Delisle
a06464c59f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-26 09:12:10 -05:00
Marc Delisle
15ca54dee5 Merge commit '8021f31' 2013-12-26 09:09:31 -05:00
Marc Delisle
8021f31e36 bug #4201 Exports are not compressed 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-26 09:08:23 -05:00
Weblate
0bce051173 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-26 14:40:04 +01:00
Chien Wei Lin
32c38e3965 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2749 of 2749)
 2013-12-26 14:39:38 +01:00
Michal Čihař
760f6765b3 Translated using Weblate (Romanian) 
Currently translated at 59.0% (1624 of 2749)
 2013-12-26 14:38:32 +01:00
Madhura Jayaratne
74a7e1c0a4 Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:07:50 +05:30
Madhura Jayaratne
9ab62d5e17 bug #4200 Missing syntax highlighting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2013-12-26 19:03:17 +05:30
Weblate
c34fe3acde Merge remote-tracking branch 'origin/master' 2013-12-26 12:54:32 +01:00
Chien Wei Lin
d48e76d7e9 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-26 12:50:29 +01:00
Marc Delisle
8449bb1f8f Merge pull request #807 from Chanaka/rfe_1447 
rfe-1447 - Use single table to display Charsets and Collations
 2013-12-26 03:45:32 -08:00
Marc Delisle
f698bf5f41 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-26 06:28:37 -05:00
Marc Delisle
a3b2370aeb Refactor: new PMA_getExportFilenameAndMimetype() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-26 06:26:51 -05:00
Michal Čihař
9b23fcd1fd Translated using Weblate (Romanian) 
Currently translated at 57.5% (1581 of 2749)
 2013-12-26 10:38:14 +01:00
Weblate
7b54c1eda0 Merge remote-tracking branch 'origin/master' 2013-12-26 05:17:34 +01:00
Chien Wei Lin
5a5ecb2f9d Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-26 05:17:30 +01:00
Chien Wei Lin
9359e8d267 Translated using Weblate (Traditional Chinese) 
Currently translated at 100.0% (2751 of 2751)
 2013-12-26 05:17:26 +01:00
Atul Pratap Singh
009619dfd0 adjust sticky columns on nav width resize 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-26 14:28:37 +05:30
Atul Pratap Singh
b7bef8471a Add some docblocks 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-26 14:28:11 +05:30
Atul Pratap Singh
635c5fc641 Feature#1478 Make Column Headings Sticky 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2013-12-26 14:27:37 +05:30
Madhura Jayaratne
ba4fd1bda1 Fix chart tooltips 2013-12-26 09:41:57 +05:30
Marc Delisle
33b180e9d8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2013-12-25 19:25:33 -05:00
Marc Delisle
d40e238e93 Refactor: new PMA_getMemoryLimitForExport() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-25 19:19:28 -05:00
Hugues Peccatte
9ed6ae9931 Merge pull request #805 from Tithugues/refactoringPluginProperties 
Factorizing properties and methods of plugin properties in the abstract.
 2013-12-25 14:24:24 -08:00
Hugues Peccatte
17dd254c3f Fix factorizing. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-25 22:45:57 +01:00
Marc Delisle
4d913bb009 Refactor: new PMA_getHtmlForDisplayedExportFooter() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-25 13:23:32 -05:00
Chanaka Indrajith
93a1ae3d28 rfe-1447 - Use single table to display Charsets and Collations 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2013-12-25 21:48:00 +05:30
Weblate
1f889db654 Merge remote-tracking branch 'origin/master' 2013-12-25 16:53:18 +01:00