gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,544 Commits 12 Branches 481 Tags 2.4 GiB
98e71f8805
Commit Graph

136 Commits

Author SHA1 Message Date
Ammar Yasir
57af6f9502 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/tbl_select.js
 2011-08-12 00:10:17 +05:30
Michal Čihař
8f618e6f01 Convert more occurences of inline autosubmit code to external js 2011-08-08 13:29:20 +02:00
Ammar Yasir
7c66a8bed5 Merge remote branch 'phpmyadmin/master' 
Conflicts:
	js/highcharts/highcharts.js
 2011-07-22 16:50:30 +05:30
Michal Čihař
3f8badd37f Replace tabs with spaces, cleanup identation 2011-07-22 09:53:41 +02:00
Michal Čihař
25bda8e991 Fix spacing on opening code block 2011-07-22 09:18:02 +02:00
Michal Čihař
219ec73d69 Spacing around if 2011-07-22 09:10:37 +02: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
Ammar Yasir
ea171beebe Merge remote branch 'phpmyadmin/master' 2011-07-10 08:13:46 +05:30
Thilanka Kaushalya
2196080954 Fixed the issue adding time picker to insert dialog 2011-07-09 10:26:00 -04:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Ammar Yasir
fb8a4956a8 Merge remote branch 'phpmyadmin/master' 2011-06-21 04:35:24 +05:30
Rouslan Placella
a0504f47d6 Merge branch 'master' into rte 2011-06-17 17:12:36 +01:00
Ammar Yasir
9498f5d4cd Merge remote branch 'phpmyadmin/master' 2011-06-17 01:06:38 +05:30
Thilanka Kaushalya
161f8977fa Fixed the delay at dialog load in table insert 2011-06-15 11:35:59 +05:30
Thilanka Kaushalya
f2588c536d Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2011-06-10 22:15:57 +05:30
Thilanka Kaushalya
b53ac0870c Apply ajax behavior to the insert to table option in db structure 2011-06-10 11:06:36 +05:30
Ammar Yasir
763fa66d72 Merge remote branch 'phpmyadmin/master' 2011-06-09 02:54:33 +05:30
Tyron Madlener
5e09426666 Merge 2011-06-06 14:38:56 +02:00
Rouslan Placella
c27b2e776b Merge branch 'master' into rte 2011-06-06 12:44:15 +01:00
Michal Čihař
3cf4830bbb Replace TRUE/FALSE with true/false. 
At least this seems to be the coding standard, so make all files
compliant.
 2011-06-06 11:55:09 +02:00
Ammar Yasir
a4fda9e8f9 Merge remote branch 'phpmyadmin/master' 2011-06-06 04:16:55 +05:30
Gábor Kövesdán
4294f8ea41 patch #3271804 New DisableMultiTableMaintenance directive 2011-06-05 06:53:34 -04:00
Ammar Yasir
459b57ca57 Merge remote branch 'phpmyadmin/master' 2011-05-27 17:46:30 +05:30
Ammar Yasir
ae44636606 Made some changes on the tbl_select.php page to add a link for Zoom Search. 
Please dont mind the coding, I just coded very quickly to get back comments. If the flow of the interface is ok I'll code it properly.
 2011-05-23 21:26:07 +05:30
Rouslan
6547444673 Removed references to Routines, Triggers and Events from *_structute.php files 2011-05-21 17:39:09 +01:00
root
aac58fd425 testing for push 2011-05-18 22:40:33 +05:30
ayax88
3222d3a43d Add support for mass prefix change (rfe#2021981). 2011-05-11 13:33:29 +02:00
Michal Čihař
5f1f0a8bdb Forgotten use of translated string 2011-03-18 14:53:05 +01:00
Michal Čihař
fc965daabd Do not pass translated strings as parameter. 
This can cause problem for non ascii languages and breaks if user
meanwhile switches language.
 2011-03-18 14:32:36 +01:00
Marc Delisle
dea96e2e5a Conditional Ajax for db Structure and Tracking 2011-01-29 11:15:35 -05:00
Marc Delisle
b41947d46e Page selector in navi panel and in db Structure did not trigger on change 2011-01-09 07:52:30 -05:00
erickoh75
3fc7fc55ee patch #3147400 [structure] Aria table size printed as unknown 2010-12-29 08:31:51 -05:00
Marc Delisle
e161824418 adjust totals when emptying a table; also use classes for more precise handling of td 2010-11-14 07:37:14 -05:00
Marc Delisle
9f4dc04691 no need to have a separate file for this 2010-11-05 06:30:21 -04:00
Marc Delisle
7f41f94a0e gettext-style message 2010-10-07 15:12:45 -04:00
Dieter Adriaenssens
90c48f8696 Merge branch 'QA_3_3' 2010-10-07 20:51:08 +02:00
Dieter Adriaenssens
8c34269e52 bug #3062454, Display routines/events also when no tables are defined 2010-10-07 20:32:07 +02:00
Marc Delisle
67aefea2be remove author names as per our policy 2010-09-26 08:40:58 -04:00
Marc Delisle
eef35043dd bug #3072502 Text not shown for icons after creating table 2010-09-26 08:39:28 -04:00
Marc Delisle
98a5ba7317 misleading variable name 2010-09-04 07:01:30 -04:00
Herman van Rink
7aa4aa62dc bug #3056610 [interface] Removed modification options for information_schema 2010-09-02 11:53:53 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Michal Čihař
3910ce6121 Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. 2010-07-26 16:35:52 +02:00
Michal Čihař
d291827444 No need to require_once footer 
It is the last thing executed anyway (ends with exit).
 2010-07-26 16:20:24 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Marc Delisle
56ebe05af7 blob streaming code cleanup (work in progress) 2010-07-22 13:15:27 -04:00
Barry Leslie
f8653e5803 Update blob streaming to match the current API and use the PBMS PHP extension. 2010-07-22 11:23:37 -04:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00