gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,503 Commits 12 Branches 481 Tags 2.4 GiB
58bf367478
Commit Graph

101503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
58bf367478 Fix checking tables having overhead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 20:53:58 +05:30
Madhura Jayaratne
c9954e1261 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-31 20:30:07 +05:30
Madhura Jayaratne
dae81cbf4d Fix retrieve default storage engine correctly 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 20:27:40 +05:30
Weblate
6c2b535f10 Merge remote-tracking branch 'origin/master' 2015-07-31 15:02:00 +02:00
Giovanni Sora
a41d5b1a7e Translated using Weblate (Interlingua) 
Currently translated at 70.4% (2255 of 3199 strings)

[CI skip]
 2015-07-31 15:01:56 +02:00
Marc Delisle
f62fba7fc7 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 09:01:48 -04:00
Marc Delisle
1c416c14d6 Directly use the POST parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 08:38:59 -04:00
Marc Delisle
f1431ec19f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 07:07:05 -04:00
Marc Delisle
3be360f062 Improve a message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-31 07:06:31 -04:00
Marc Delisle
dea0956fab Translated using Weblate (French) 
Currently translated at 99.8% (3190 of 3194 strings)

[CI skip]
 2015-07-31 12:29:24 +02:00
Marc Delisle
34da741fbb Translated using Weblate (French) 
Currently translated at 99.8% (3190 of 3194 strings)

[CI skip]
 2015-07-31 12:26:01 +02:00
Madhura Jayaratne
f8c00915dd Use proper names as file names. Fix undefined notices 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 15:32:51 +05:30
Madhura Jayaratne
e9dfc964e3 Merge branch 'QA_4_4' 2015-07-31 14:17:46 +05:30
Madhura Jayaratne
3837aaaeb3 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-07-31 14:15:47 +05:30
Madhura Jayaratne
199e8d2544 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:14:33 +05:30
Madhura Jayaratne
35d36f966d Revert "Support alias" 
This reverts commit 2cfaf8f411.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:08:10 +05:30
Madhura Jayaratne
3354439a86 Reorganize to improve clarity. Join routines with tables when exporting as separate files. Export metadata and events when exporting as separate files. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:06:39 +05:30
Madhura Jayaratne
91fd305782 Do not export events in case of exporting tables separately 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 13:01:46 +05:30
Madhura Jayaratne
2cfaf8f411 Support alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:54:51 +05:30
Madhura Jayaratne
8ebb632bc2 Merge branch 'QA_4_4' 2015-07-31 12:42:54 +05:30
Weblate
375602fc21 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-31 09:07:46 +02:00
Moshe Harush
2a6de8495c Translated using Weblate (Hebrew) 
Currently translated at 18.9% (577 of 3038 strings)

[CI skip]
 2015-07-31 09:07:42 +02:00
Madhura Jayaratne
8afa7fdaf3 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-07-31 12:37:38 +05:30
Madhura Jayaratne
eea2bf811a Fix #11336 Exporting a table exports database level events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:36:53 +05:30
Madhura Jayaratne
c0ddc89eb1 Fix missing space between the icon and text 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:50:56 +05:30
Madhura Jayaratne
52d3ed7d80 Fix displaying db collation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:38:25 +05:30
Madhura Jayaratne
6edc4038d6 Display total overhead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:35:09 +05:30
Madhura Jayaratne
9d9c9f9c1e Fix displaying unit 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 10:32:26 +05:30
Atul Pratap Singh
f703a05c55 Merge pull request #11335 from Tithugues/replaceInefficientJquerySelector_master 
Replace inefficient jQuery selectors.
 2015-07-31 07:13:00 +05:30
Hugues Peccatte
13e43c82bd Replace inefficient jQuery selectors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-30 21:56:22 +02:00
Weblate
f3668b3e33 Merge remote-tracking branch 'origin/master' 2015-07-30 18:06:22 +02:00
Kristjan Räts
880a3d8b99 Translated using Weblate (Estonian) 
Currently translated at 99.3% (3172 of 3194 strings)

[CI skip]
 2015-07-30 18:06:18 +02:00
Marc Delisle
301dd9e05f Fix notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-30 12:06:09 -04:00
Stefano Martinelli
68a0fc4632 Translated using Weblate (Italian) 
Currently translated at 100.0% (3193 of 3193 strings)

[CI skip]
 2015-07-30 15:57:24 +02:00
Kristjan Räts
8de8bafffe Translated using Weblate (Estonian) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-07-30 15:21:25 +02:00
Marc Delisle
c30271da7a Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-30 08:33:37 -04:00
Marc Delisle
0251483007 Translated using Weblate (French) 
Currently translated at 99.7% (3187 of 3194 strings)

[CI skip]
 2015-07-30 13:53:06 +02:00
Marc Delisle
ee70ff7236 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 19:33:44 -04:00
Marc Delisle
da4bcee69f Directly use the POST parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 18:43:12 -04:00
Hugues Peccatte
a810409135 Replace require_once by include_once. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-29 19:32:25 +02:00
Madhura Jayaratne
cd7711205f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-29 22:20:06 +05:30
Madhura Jayaratne
96ce8358bf Fix #11334 Table creation time, last update and last check column are empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 22:19:05 +05:30
Marc Delisle
afadbc662b Intermediate variable not needed 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-29 10:26:11 -04:00
Marc Delisle
7e44dc321a Merge pull request #11331 from Tithugues/templatingDisplayJavascript_master 
Templating PMA_displayJavascript function.
 2015-07-29 10:22:53 -04:00
Marc Delisle
4751ca3a21 Merge pull request #11329 from udan11/update 
Fixes #11325 and #11327.
 2015-07-29 05:54:19 -04:00
Marc Delisle
bfbfa539da Translated using Weblate (French) 
Currently translated at 99.7% (3185 of 3194 strings)

[CI skip]
 2015-07-29 11:49:44 +02:00
Madhura Jayaratne
097b83cd98 This is not an ajaxified form 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 12:09:30 +05:30
Madhura Jayaratne
8d0a9ff74e Fix another instance of issue #10307 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 12:07:58 +05:30
Madhura Jayaratne
cba50c1e5a Merge branch 'issue10307' 2015-07-29 12:01:44 +05:30
Madhura Jayaratne
c21377d2da Fix #10307 Replication broken when using cross-database master/slave config and phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-29 08:29:25 +05:30