gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,880 Commits 12 Branches 481 Tags 2.4 GiB
65467e9c77
Commit Graph

1052 Commits

Author SHA1 Message Date
Alex Marin
1ef56d1662 Merge branch 'master' into plugins-and-OOP 2012-06-18 14:26:13 +03:00
Michal Čihař
3d2d7bf6dd Merge remote-tracking branch 'chanaka/master' 2012-06-18 10:03:42 +02:00
Marc Delisle
7510ba77f8 PMA_generateHtmlTab() becomes PMA_getHtmlTab() 2012-06-17 08:42:09 -04:00
Marc Delisle
dbc7758f12 PMA_generateHtmlTabs() becomes PMA_getHtmlTabs() 2012-06-17 08:39:31 -04:00
Alex Marin
2c9fba0560 Merge branch 'work_week3' into plugins-and-OOP 2012-06-17 11:43:45 +03:00
Alex Marin
0899d6722e oop: merge master 2012-06-17 11:40:11 +03:00
Alex Marin
4b0dbf6a42 oop: ExportLatex 2012-06-15 19:22:07 +03:00
Chanaka Indrajith
0445b1fb51 Some improvements to common.lib.php 2012-06-14 23:59:11 +05:30
Chanaka Indrajith
35f4599870 Modifications to PMA_printButton() function in common.lib.php and renamed as PMA_getButton()() 2012-06-14 13:15:03 +05:30
Chanaka Indrajith
4720a4884c Modifications to PMA_selectUploadFile() function in common.lib.php and renamed as PMA_getSelectUploadFileBlock() 2012-06-14 13:05:10 +05:30
Chanaka Indrajith
c512706677 Modifications to PMA_browseUploadFile() function in common.lib.php and renamed as PMA_getBrowseUploadFileBlock() 2012-06-14 09:45:26 +05:30
Chanaka Indrajith
71b01ec879 Modifications to PMA_externalBug() function in common.lib.php and renamed as PMA_getExternalBug() 2012-06-14 09:22:18 +05:30
Chanaka Indrajith
9fba69e73a Modifications to PMA_listNavigator() function in common.lib.php and renamed as PMA_getListNavigator() 2012-06-14 09:02:28 +05:30
Chanaka Indrajith
253de23cf3 Resolved conflicts 2012-06-14 00:52:06 +05:30
Chanaka Indrajith
4e01dd5ae5 Resolved conflict in common.lib.php 2012-06-12 11:34:21 +05:30
Rouslan Placella
a16e723048 Dropped PMA_ajaxResponse() 2012-06-11 17:58:35 +01:00
Rouslan Placella
ef2b98dd8e Use PMA_Response class in PMA_ajaxResponse() 2012-06-11 14:06:04 +01:00
Rouslan Placella
796012fcc5 Completely drop footnotes and use tooltips instead 2012-06-11 14:06:04 +01:00
Rouslan Placella
30d7d92e02 BBCode is never used with PMA_showHint() in the code base 2012-06-11 14:06:04 +01:00
Rouslan Placella
ae6e50a8a8 Drop display() from Header and Footer classes. The Response class will do all the rendering. 2012-06-11 14:06:04 +01:00
Rouslan Placella
eb98110541 Dropped footer.inc.php 2012-06-11 14:06:04 +01:00
Rouslan Placella
a054562100 PMA_Footer and PMA_Header no longer need to be singletons 2012-06-11 14:06:03 +01:00
Rouslan Placella
e7a698200d Added PMA_Footer and PMA_Footnotes classes 2012-06-11 14:06:03 +01:00
Rouslan Placella
4a740376c8 Dropped header.inc.php in favor of the PMA_Header class 2012-06-11 14:06:02 +01:00
Rouslan Placella
d817f6cccc Renamed PMA_reloadNavigation() to PMA_getReloadNavigationScript() 2012-06-11 14:06:02 +01:00
Rouslan Placella
d6f58a27e3 Return string from PMA_reloadNavigation() 2012-06-11 14:06:02 +01:00
Rouslan Placella
bf219df66d Merge branch 'QA_3_5' 
Conflicts:
	enum_editor.php
 2012-06-11 14:01:46 +01:00
Rouslan Placella
ddd1eac480 Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values 2012-06-11 14:00:18 +01:00
Chanaka Indrajith
92b71154be Introduce DisplayResults class 2012-06-08 12:13:15 +05:30
Alex Marin
0ff6393062 plugins and OOP: merge master, fix conflicts 2012-06-04 12:14:32 +03:00
Madhura Jayaratne
27e6c2ac1b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/common.lib.php
 2012-05-29 21:54:23 +05:30
Alex Marin
a87f283a23 plugins and OOP: create general class structure and ExportXML 2012-05-28 00:21:14 +03:00
Madhura Jayaratne
def60af6e0 Various coding style improvements 2012-05-25 22:38:48 +05:30
Chanaka Indrajith
946009aace Fixed some code violations in common.lib.php 2012-05-25 00:49:01 +05:30
Chanaka Indrajith
871f19db67 Resolved conflicts in common.lib.php 2012-05-18 01:03:56 +05:30
Madhura Jayaratne
056eaed7b9 Add spaces after exclamation marks 2012-05-17 06:36:09 +05:30
Madhura Jayaratne
37820c842f Adjust docs to match their new return types 2012-05-17 06:27:08 +05:30
Madhura Jayaratne
59f4ab5280 Fix docs 2012-05-16 20:46:03 +05:30
Chanaka Indrajith
b3bcc87501 Merge remote branch 'upstream/master' 2012-05-15 12:20:17 +05:30
Marc Delisle
8ec765a8bc Improve function name 2012-05-14 13:26:40 -04:00
Chanaka Indrajith
f04a4f8989 Resolve conflicts due to changes in some method names 2012-05-13 12:47:45 +05:30
Chanaka Indrajith
dd237eb924 Resolve conflicts due to changes in method names of common.lib.php 2012-05-13 12:39:31 +05:30
Madhura Jayaratne
c115d97ec7 Avoid HTML, PHP mix in lib files 2012-05-12 22:11:02 +05:30
Madhura Jayaratne
d603a16316 Documentation comments 2012-05-12 21:53:59 +05:30
Madhura Jayaratne
2f0e8c569e Fix function names: PMA_containsNonprintableAscii -> PMA_containsNonPrintableAscii 2012-05-11 22:39:56 +05:30
Madhura Jayaratne
954b0cc69f Fix function names: PMA_unescape_mysql_wildcards -> PMA_unescapeMysqlWildcards 2012-05-11 22:31:12 +05:30
Madhura Jayaratne
f50a2deb4b Fix function names: PMA_replace_binary_contents -> PMA_replaceBinaryContents 2012-05-11 22:28:26 +05:30
Madhura Jayaratne
35d3e7e1f9 Fix function names: PMA_printable_bit_value -> PMA_printableBitValue 2012-05-11 22:26:37 +05:30
Madhura Jayaratne
7bc0d5a4ff Fix function names: PMA_generate_slider_effect -> PMA_generateSliderEffect 2012-05-11 22:23:01 +05:30
Madhura Jayaratne
8e88a282af Fix function names: PMA_generate_html_tab -> PMA_generateHtmlTab 2012-05-11 22:20:28 +05:30