gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,559 Commits 12 Branches 481 Tags 2.4 GiB
712909e69d
Commit Graph

86559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
712909e69d Another foreign key definition for information_schema 2013-08-28 14:56:01 +02:00
Marc Delisle
66da35776b Fix merge conflicts 2013-08-28 08:30:05 -04:00
Marc Delisle
0425d898bf bug #3993 Sorting in database overview with statistics doesn't work 2013-08-28 08:27:02 -04:00
Marc Delisle
586f1cda00 Fix typos 2013-08-28 07:52:51 -04:00
Marc Delisle
cf8384ec73 Merge pull request #650 from scnakandala/refac_tbl_relation.php 
Refactoring tbl_relation.php
 2013-08-28 04:50:41 -07:00
Weblate
c59d9c63ec Merge remote-tracking branch 'origin/master' 2013-08-28 10:37:28 +02:00
shanyan baishui
0a72955683 Translated using Weblate (Simplified Chinese) 
Currently translated at 95.1% (2586 of 2720)
 2013-08-28 10:37:24 +02:00
Michal Čihař
ceb35a8816 Remove debugging code 2013-08-28 10:37:05 +02:00
Spun Nakandala
e7cca79a19 added methods PMA_handleUpdateForDisplayField, PMA_getQueryForDisplayUpdate 2013-08-28 13:34:36 +05:30
Spun Nakandala
864d21a391 added methods PMA_sendHtmlForTableOrColumnDropdownList, PMA_sendHtmlForColumnDorpdownList, PMA_sendHtmlForTableDropdownList 2013-08-28 13:03:10 +05:30
Spun Nakandala
6a2bf642be extracted methods from tbl_relation.php to tbl_relation.lib.php for rendering html 2013-08-28 12:38:35 +05:30
Madhura Jayaratne
55b233bd47 Load a real theme 2013-08-28 10:06:33 +05:30
Madhura Jayaratne
b25ba604e9 Fix failing tests. Make tests run independently. 2013-08-28 07:32:32 +05:30
Madhura Jayaratne
d4c3a75e3e Add missing doc comment 2013-08-27 23:38:13 +05:30
Madhura Jayaratne
2897c93b58 Add types 2013-08-27 23:37:52 +05:30
Madhura Jayaratne
0dbf3fc819 Revert 23dee32a29 2013-08-27 22:34:06 +05:30
Madhura Jayaratne
5e5b6070df Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-08-27 22:23:11 +05:30
Madhura Jayaratne
aa58386e0e Use types 2013-08-27 22:22:14 +05:30
Marc Delisle
24d1315dbd Fix merge conflict 2013-08-27 12:39:42 -04:00
Marc Delisle
79b3b68de7 Merge branch 'QA_4_0' 2013-08-27 12:39:14 -04:00
Marc Delisle
ceb09a82fa 4.0.7-dev 2013-08-27 12:38:57 -04:00
Madhura Jayaratne
f3edd98a15 Use type hinting 2013-08-27 22:07:43 +05:30
Marc Delisle
4fe8bb5a5a Merge branch 'MAINT_4_0_6' into QA_4_0 2013-08-27 12:37:42 -04:00
Madhura Jayaratne
23dee32a29 Fix failing test 2013-08-27 22:07:23 +05:30
Marc Delisle
924f2523ca 4.0.6-rc1 2013-08-27 12:37:17 -04:00
Madhura Jayaratne
fa2a226585 Fix indentation 2013-08-27 21:38:29 +05:30
Madhura Jayaratne
e72bcb697f Add type 2013-08-27 21:37:19 +05:30
Madhura Jayaratne
1b681d9c80 Fix syntax error 2013-08-27 21:32:47 +05:30
Madhura Jayaratne
44cb804ad7 Merge pull request #648 from ibennetch/pdfDoc 
Document PDFDefaultPageSize and PDFPageSizes; bug 3938
 2013-08-27 08:47:39 -07:00
Marc Delisle
09e14a6113 Fix typo 2013-08-27 11:00:37 -04:00
Marc Delisle
9fa4fc0df9 Merge branch 'QA_4_0' 2013-08-27 10:59:01 -04:00
Marc Delisle
220bedbef6 Merge commit '25beabc' 2013-08-27 10:58:48 -04:00
Marc Delisle
c0bd3cda06 Remove dead test 2013-08-27 10:58:05 -04:00
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Marc Delisle
751cf3caa4 ChangeLog entry for ShowTooltip directive removal 2013-08-27 10:40:40 -04:00
Marc Delisle
25beabce96 Merge pull request #646 from nijel/remove-navi-tooltip 
Do not show tooltip in table navigation
 2013-08-27 07:37:48 -07:00
Isaac Bennetch
e285e56497 Document PDFDefaultPageSize and PDFPageSizes; bug 3938 2013-08-27 10:18:05 -04:00
Isaac Bennetch
fa87bcec06 Merge pull request #582 from kasunchathuranga/fractionalSecs 
Use fractional seconds in time, datetime and timestamp
 2013-08-27 06:37:30 -07:00
Isaac Bennetch
c036ae1d5c Merge pull request #641 from kasunchathuranga/navIcon 
Change the icon of views in navigation to show that they lead to view structure page
 2013-08-27 06:29:24 -07:00
Isaac Bennetch
8b25e295c4 Merge pull request #642 from kasunchathuranga/configurableMenus 
Do not show 'User groups' sub tab in database 'Privileges' page
 2013-08-27 06:22:21 -07:00
Atul Pratap Singh
f2be730843 Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-08-27 17:47:51 +05:30
Marc Delisle
18c35b7689 Merge branch 'QA_4_0' 2013-08-27 08:11:33 -04:00
Marc Delisle
0232b5d32d Document new default value 2013-08-27 08:10:50 -04:00
Marc Delisle
a1efb99231 Merge pull request #647 from nijel/more-items 
Increase default maximal number of navigation items
 2013-08-27 05:09:28 -07:00
Atul Pratap Singh
f7e298bbf4 Remove multiple navigation reloads, fix autoexpand on use query 2013-08-27 17:34:45 +05:30
Atul Pratap Singh
278145ffd3 Hide throbber on navigation reload 2013-08-27 16:56:09 +05:30
Michal Čihař
c921f6f807 Increase default maximal number of navigation items 
The load times should not be that big issue with 250 items and it helps
loading all tables/databases for most users.
 2013-08-27 11:10:32 +02:00
Michal Čihař
1084e4dfdd Do not show tooltip in table navigation 
Most tables don't have any comment set and this causes serious slow down
of a navigation.
 2013-08-27 11:08:28 +02:00
Michal Čihař
7b28967ea5 Upgrade TCPDF to 6.0.023 
Changes:

6.0.023 (2013-08-05)
    - GNU Freefont fonts were updated.
    - Licensing and copyright information about fonts were improved.
    - PNG image support was improved.

6.0.022 (2013-08-02)
    - fixing initialization problem for signature_appearance property.

6.0.021 (2013-07-18)
    - The bug caused by the preg_split function on some PHP 5.2.x versions was fixed.

6.0.020 (2013-06-04)
    - The method addTTFfont() was fixed (Bug item #813 Undefined offset).

6.0.019 (2013-06-04)
    - The magic constant __DIR__ was replaced with dirname(__FILE__) for php 5.2 compatibility.
    - The exceptions raised by file_exists() function were suppressed.
 2013-08-27 10:06:30 +02:00
Michal Čihař
abd818826e Merge commit '2f3f1bcccb6ce82407076c1c47e4d6f917deb971' 2013-08-27 10:03:05 +02:00