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

101405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
9e2e1b4c0e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 18:36:48 +05:30
Madhura Jayaratne
11d8de1ca9 Fix #11324 JS error while opening a new page in Desginer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 18:35:45 +05:30
Marc Delisle
bb81230644 Translated using Weblate (French) 
Currently translated at 99.5% (3179 of 3194 strings)

[CI skip]
 2015-07-27 14:47:44 +02:00
Weblate
55a0ca2693 Merge remote-tracking branch 'origin/master' 2015-07-27 14:37:32 +02:00
Andrey Aleksanyants
fbd70972f4 Translated using Weblate (Armenian) 
Currently translated at 49.9% (1596 of 3194 strings)

[CI skip]
 2015-07-27 14:37:28 +02:00
Madhura Jayaratne
df1582d625 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 18:06:34 +05:30
Madhura Jayaratne
80c944ef2b Upgrade TCPDF to version 6.2.9 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 18:05:14 +05:30
Andrey Aleksanyants
3bdcaaa9c6 Translated using Weblate (Armenian) 
Currently translated at 43.0% (1375 of 3194 strings)

[CI skip]
 2015-07-27 10:48:32 +02:00
Madhura Jayaratne
6c37fd9e36 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-27 12:31:20 +05:30
Madhura Jayaratne
6504d2f10d Align 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 12:30:10 +05:30
Weblate
733999cf79 Merge remote-tracking branch 'origin/master' 2015-07-27 08:59:45 +02:00
Andrey Aleksanyants
0f89acf434 Translated using Weblate (Armenian) 
Currently translated at 43.0% (1374 of 3194 strings)

[CI skip]
 2015-07-27 08:59:41 +02:00
Madhura Jayaratne
805b0d7860 Fix #11322 Missing null checkbox when grid editing a null cell 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-27 12:29:26 +05:30
Hauke Henningsen
c4e9b9ac86 Translated using Weblate (German) 
Currently translated at 100.0% (3194 of 3194 strings)

[CI skip]
 2015-07-27 03:36:42 +02:00
Atul Pratap Singh
7d715931a1 Fix some code style warnings 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-27 01:46:00 +05:30
Atul Pratap Singh
bbbb6c7482 correct indentation 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-27 01:37:02 +05:30
Atul Pratap Singh
47a747532e Fix some errors in structure refactoring 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-27 01:24:34 +05:30
Weblate
9bded6fcfb Merge remote-tracking branch 'origin/master' 2015-07-26 21:50:44 +02:00
josep constanti
6b1fd538b2 Translated using Weblate (Catalan) 
Currently translated at 96.1% (3069 of 3193 strings)

[CI skip]
 2015-07-26 21:50:40 +02:00
Andrey Aleksanyants
69b7f6d229 Translated using Weblate (Armenian) 
Currently translated at 42.2% (1351 of 3194 strings)

[CI skip]
 2015-07-26 21:50:38 +02:00
Atul Pratap Singh
5016177234 Merge pull request #1805 from gzzhanghao/structure 
Refactor structure.lib.php (Creating Templates)
 2015-07-27 01:20:31 +05:30
Jason
1b4cafa992 Fix a typo cause db structure not showing 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:12:38 +08:00
Jason
41ee245a43 Refactor PMA_getHtmlForFavoriteAnchor and remove unused functions 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:09:07 +08:00
Jason
2a5a91e9f3 Refactor PMA_getHtmlForShowCreate, PMA_tableHeader, PMA_getHtmlForMoveColumnsDialog, PMA_getHtmlForStructureTableRow 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:09:07 +08:00
Andrey Aleksanyants
47c6bda060 Translated using Weblate (Armenian) 
Currently translated at 35.5% (1135 of 3194 strings)

[CI skip]
 2015-07-26 15:07:50 +02:00
Jason
8ac6c15b32 Refactor PMA_getHtmlForDisplayTableStats and move template calls into db_structure.php and tbl_structure.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:05:47 +08:00
Jason
f90c3326f7 Refactor PMA_getHtmlForActionsInTableStructure and getHtmlForRowStatsTable 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:05:47 +08:00
Jason
c08c98727d Fix table structure not displaying 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:03:00 +08:00
Jason
15c8cb4421 Create templates for structure.lib.php 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-26 21:03:00 +08:00
Marc Delisle
94d08aa6ee Merge branch 'QA_4_4' 2015-07-26 08:42:34 -04:00
Marc Delisle
18bba53e30 Merge commit 'da0630a' 2015-07-26 08:42:20 -04:00
Marc Delisle
6be170e227 Fix PHP 7 possible binding ambiguity 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-26 08:41:26 -04:00
Hugues Peccatte
0a31c8f1af Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-26 13:59:37 +02:00
Andrey Aleksanyants
50a41ea683 Translated using Weblate (Armenian) 
Currently translated at 35.5% (1135 of 3194 strings)

[CI skip]
 2015-07-26 13:22:09 +02:00
Marc Delisle
564dc18684 Translated using Weblate (French) 
Currently translated at 99.3% (3174 of 3194 strings)

[CI skip]
 2015-07-26 13:22:04 +02:00
Weblate
0632241a64 Merge remote-tracking branch 'origin/master' 2015-07-26 13:01:56 +02:00
Andrey Aleksanyants
0facd2a03b Translated using Weblate (Armenian) 
Currently translated at 35.3% (1130 of 3194 strings)

[CI skip]
 2015-07-26 13:01:52 +02:00
Atul Pratap Singh
2fb9e71f11 Merge pull request #11321 from Tithugues/templatingUserPrefs_master 
Templating user preferences form.
 2015-07-26 16:31:50 +05:30
Weblate
8ce5233db2 Merge remote-tracking branch 'origin/master' 2015-07-26 12:32:16 +02:00
Martin Lacina
7fcf741ba5 Translated using Weblate (Slovak) 
Currently translated at 82.5% (2636 of 3194 strings)

[CI skip]
 2015-07-26 12:32:12 +02:00
popcorner
9adf36190a Translated using Weblate (Chinese (China)) 
Currently translated at 75.5% (2412 of 3194 strings)

[CI skip]
 2015-07-26 12:32:09 +02:00
josep constanti
ed0a285d41 Translated using Weblate (Catalan) 
Currently translated at 96.0% (3068 of 3193 strings)

[CI skip]
 2015-07-26 12:32:07 +02:00
Andrey Aleksanyants
d34cac2a92 Translated using Weblate (Armenian) 
Currently translated at 34.8% (1112 of 3194 strings)

[CI skip]
 2015-07-26 12:32:06 +02:00
Hugues Peccatte
a0070f411d Add/update PHPDoc. 
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-26 12:31:57 +02:00
Marc Delisle
38368c4659 ChangeLog entry 
Fixes #4962

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-25 20:54:49 -04:00
Marc Delisle
36bc17c596 ChangeLog entry 
Fixes #5437

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-25 20:47:47 -04:00
Marc Delisle
086e906cb3 Changelog entry 
Fixes #6118

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-25 20:43:16 -04:00
Marc Delisle
a240b32979 Merge pull request #1816 from udan11/misc 
Added tests for sql.lib.php and parse_analyze.inc.php.
 2015-07-25 20:36:32 -04:00
Weblate
bb5921d231 Merge remote-tracking branch 'origin/master' 2015-07-25 23:02:12 +02:00
Andrey Aleksanyants
dc50a57bc0 Translated using Weblate (Russian) 
Currently translated at 97.4% (3111 of 3194 strings)

[CI skip]
 2015-07-25 23:02:08 +02:00