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

748 Commits

Author SHA1 Message Date
Michal Čihař
9730a6b3d7 Merge commit '97b1375605f241481a953e2c78eb42d43f84fa9d' 
Conflicts:
	js/functions.js
	libraries/common.lib.php
	libraries/header.inc.php
	server_status.php
 2011-07-21 15:51:05 +02:00
Michal Čihař
bb3cb6d99c Fix docblocks 2011-07-21 15:32:40 +02:00
Michal Čihař
aa45961965 Add missing docs 2011-07-21 15:32:40 +02:00
Marc Delisle
33627e9533 Merge commit '788fb45a1d6c70d52e8b627023bf01de34a22a4d' 2011-07-21 09:18:44 -04:00
Michal Čihař
f1c526f17a Whitespace cleanup 2011-07-21 13:01:32 +02:00
Michal Čihař
b2173a8e4e Localize error message 2011-07-21 13:01:23 +02:00
Michal Čihař
48e9af42e0 Add missing space after foreach calls 2011-07-21 11:21:26 +02:00
Thilanka Kaushalya
788fb45a1d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-07-21 10:01:58 +05:30
Thilanka Kaushalya
d00cf18325 Fixed bugs in convert foot notes to tooltips logic 2011-07-21 10:01:21 +05:30
Herman van Rink
9c4fd802ab Merge remote branch 'origin/master' into unittesting 2011-07-19 22:09:28 +02:00
Thilanka Kaushalya
1c333e0a08 Fixed iid dulplication issue in footnote convertion using classes 2011-07-19 22:59:22 +05:30
Tyron Madlener
3b3a9fc762 pma spritify part 2 2011-07-15 09:42:16 +03:00
Tyron Madlener
bf23143424 Merge remote-tracking branch 'origin/master' 
Conflicts:
	ChangeLog
	Documentation.html
	db_events.php
	db_routines.php
	db_structure.php
	db_triggers.php
	js/db_structure.js
	js/functions.js
	js/indexes.js
	js/makegrid.js
	js/messages.php
	js/sql.js
	js/tbl_structure.js
	libraries/Table.class.php
	libraries/common.lib.php
	libraries/config.default.php
	libraries/config/messages.inc.php
	libraries/config/setup.forms.php
	libraries/config/user_preferences.forms.php
	libraries/database_interface.lib.php
	libraries/db_events.inc.php
	libraries/db_links.inc.php
	libraries/display_tbl.lib.php
	libraries/tbl_links.inc.php
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.po
	po/br.po
	po/bs.po
	po/ca.po
	po/cs.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/et.po
	po/eu.po
	po/fa.po
	po/fi.po
	po/fr.po
	po/gl.po
	po/he.po
	po/hi.po
	po/hr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/ka.po
	po/ko.po
	po/lt.po
	po/lv.po
	po/mk.po
	po/ml.po
	po/mn.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/phpmyadmin.pot
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/si.po
	po/sk.po
	po/sl.po
	po/sq.po
	po/sr.po
	po/sr@latin.po
	po/sv.po
	po/ta.po
	po/te.po
	po/th.po
	po/tr.po
	po/tt.po
	po/ug.po
	po/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
	server_status.php
	tbl_triggers.php
	themes/original/css/theme_right.css.php
	themes/original/jquery/jquery-ui-1.8.override.css
	themes/pmahomme/css/theme_right.css.php
	themes/pmahomme/img/s_sortable.png
	themes/pmahomme/jquery/jquery-ui-1.8.override.css
 2011-07-14 15:56:31 +03:00
Tyron Madlener
da943ecbf7 PMA Icons to sprites part 1 2011-07-14 15:37:08 +03:00
Piotr Przybylski
f57faf6b58 Removed unused code 2011-07-13 17:29:07 +02:00
Piotr Przybylski
df4c23f0c9 Comments and formatting in common.lib.php 2011-07-13 17:29:06 +02:00
Piotr Przybylski
b5d450ff31 PMA_MYSQL_INT_VERSION is at least 50015 2011-07-13 17:29:06 +02:00
Herman van Rink
cf8ea68f09 Merge remote-tracking branch 'origin/master' into unittesting 2011-07-13 11:58:08 +02:00
Rouslan Placella
dad5d3594a Merge branch 'master' into rte 2011-07-07 12:31:53 +01:00
Piotr Przybylski
c9df5b2733 Removed unused variables 2011-07-06 16:34:10 +02:00
Zarubin Stas
91709ec0c1 New PHPUnit tests for common.lib.php 2011-07-06 10:47:10 +03:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Rouslan Placella
c150eb0c7c Integrate PMA_toggleButton() with $cfg['AjaxEnable'] 2011-06-30 13:19:31 +01:00
Rouslan Placella
b4b56ed461 Merge branch 'master' into rte 
Conflicts:
	db_routines.php
	libraries/db_events.inc.php
	libraries/rte/rte_routines.lib.php
 2011-06-30 11:42:16 +01:00
Rouslan Placella
cbafdb9a1f Refactored some routine, trigger and event manipulation code 2011-06-28 17:11:53 +01:00
Michal Čihař
c9c9fdf49d Consistent capitalisation of PMA_sqlAddSlashes 2011-06-27 14:48:15 +02:00
Michal Čihař
e57f27e50b Remove @uses tags from docblocks 2011-06-27 11:20:20 +02:00
Marc Delisle
7322e858f0 Incorrect comment for return param 2011-06-26 09:05:19 -04:00
Rouslan Placella
223832b68d E_ALL fix in PMA_currentUserHasPrivilege() 2011-06-20 11:33:06 +01:00
Rouslan Placella
db6ae660cf Removed duplicate function PMA_getSupportedCharsets() that was added by mistake into the routines functionality. 2011-06-20 10:44:37 +01:00
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Rouslan Placella
4047020d78 Refactored code that generated the dropdown list of MySQL functions. 2011-06-15 12:45:50 +01:00
Aris Feryanto
b3faf9cf42 Merge branch 'tablesort' into aris 2011-06-15 07:23:37 +07:00
Aris Feryanto
5bf8536831 Fix bug in 'Remember Sorting': modified caused error in PHP 2011-06-15 07:10:16 +07:00
Rouslan Placella
dda7ce9c39 Merge branch 'master' into rte 2011-06-14 19:44:09 +01:00
Rouslan Placella
041d5bd9d4 Moved PMA_getSupportedCharsets() to common.lib.php 2011-06-14 14:05:37 +01:00
Rouslan Placella
c220bb4e13 Moved PMA_getSupportedDatatypes() to common.lib.php 2011-06-14 13:56:00 +01:00
Tyron Madlener
e6874ce0c7 Clearer comment on PMA_formatNumber() 2011-06-13 18:53:45 +02:00
Tyron Madlener
2816b427ab Merge remote-tracking branch 'origin/master' 2011-06-13 15:00:11 +02:00
Tyron Madlener
f4a2a92ea2 Fixed PMA_formatNumber() sometimes choosing too high SI preifx 2011-06-10 19:26:03 +02:00
Rouslan Placella
aa2692c12f Fixed call to undefined function. 2011-06-10 15:36:44 +01:00
Rouslan Placella
a07a1d997c Merge branch 'master' into rte 2011-06-09 21:26:26 +01:00
Piotr Przybylski
90099b7b5d Remove PMA_STR_binarySearchInArr in favor of isset and in_array 2011-06-08 19:23:58 +02:00
Tyron Madlener
9410a4cfd9 Forgot 2 lines in PMA_formatNumber() 2011-06-08 10:31:22 +02:00
Tyron Madlener
0d1872595f Math to the resuce! Nicer calculation of PMA_formatNumber() without any loops 2011-06-08 10:19:59 +02:00
Tyron Madlener
902fc1d95d - Replaced pChart profiling chart with highchart chart 
- Moved PMA_profilingResults() function code inline in sql.php as its used at only one place
 2011-06-07 21:32:05 +02:00
Tyron Madlener
e913dcc6e1 -Tabs +Spaces 2011-06-07 20:58:56 +02:00
Tyron Madlener
86323a7815 Better PMA_formatNumber() behaviour. 2011-06-07 20:50:38 +02:00
Rouslan Placella
6752d54b84 Support "MySQL functions" in the Execute Routine functionality. 2011-06-07 14:15:41 +01:00
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00