nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,495 Commits 1 Branch 0 Tags
8ddfb7140dbff7556ceab8d8b293f21c8d97f79c
Commit Graph

17495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
f6ef0c87a8 Merge branch 'QA_3_3' 2010-07-12 08:57:05 -04:00
Marc Delisle
cda9df7101 bug [export] CSV for MS Excel (Windows) should have semi-colon as separator 2010-07-12 08:56:30 -04:00
ninadsp
35c922e704 Basic Table Search now works. Need to handle some error cases 2010-07-12 00:14:05 +05:30
ninadsp
4eb4d318bb Forgot to set the context for the recently added $(document).ready() 
snippets.  Added them
 2010-07-11 23:51:02 +05:30
ninadsp
fe9f539ed2 Removed inline coding for Drop Trigger in libraries/tbl_triggers.lib.php 2010-07-11 23:36:24 +05:30
ninadsp
dd58a5bc23 Removed inline calls to confirmLink() for Empty/Drop Table actions in libraries/tbl_links.inc.php 2010-07-11 23:14:41 +05:30
ninadsp
a180017106 Moved Ajax handlers of db_structure.php to a dedicated file js/db_structure.js from js/functions.js 2010-07-11 22:33:52 +05:30
ninadsp
94a911a623 Removed inline call in libraries/display_tbl.lib.php to confirmAction() 
for 'Calculate Real End' action on large InnoDB tables.
 2010-07-11 22:23:57 +05:30
Marc Delisle
ce2cad2886 fix merge conflicts 2010-07-11 08:05:50 -04:00
Marc Delisle
b55ba34d43 bug #3023507 [core] No result set display from stored procedure SELECT 2010-07-11 08:00:42 -04:00
ninadsp
3586dd6408 Removed inline call to confirmLink() for 'Drop Primary Key/Index' 2010-07-11 03:33:04 +05:30
ninadsp
505884174b Removed inline call to confirmLink() for 'Delete Tracking action'. 2010-07-11 03:14:02 +05:30
ninadsp
d5ed68aa71 Removed inline call to confirmLink() for 'Drop Procedure' 2010-07-11 02:32:10 +05:30
ninadsp
70a8735c07 Removed inline call to confirmLink() for 'Drop Event' action 2010-07-11 02:08:47 +05:30
ninadsp
e98edae53b Remove previous queries if any before inserting the latest query. We 
don't want too many queries crowding up.
 2010-07-11 00:14:12 +05:30
ninadsp
6230a545bf Cloning and removal of rows happens correctly now. All name/id 
properties of the inputs are changed on the fly with javascript.
 2010-07-10 23:45:03 +05:30
Marc Delisle
b2616ac46d bug #3027557 [PHP] split() deprecated in PHP 5.3 (backport fixes from master, todo: update PHP excel?) 2010-07-10 08:01:07 -04:00
ninadsp
cbe82879e8 Hooked in Ajax submission of data. Changint the number of insertions on 
the fly is still a work in progress.  Insertion tables are being
cloned/deleted, however, each is not unique.
 2010-07-10 17:14:10 +05:30
ninadsp
ca0af7fff7 Added a string for Ajax handlers in tbl_change.php 2010-07-10 17:09:36 +05:30
ninadsp
7d11c0aa92 Added ids to some HTML elements on tbl_change.php and modified the 
output of tbl_replace.php for Ajax requests.
 2010-07-10 17:07:37 +05:30
lorilee
0900dc1b0b Fixed a formatting bug 2010-07-08 14:07:36 -07:00
lorilee
8b6e179bd9 Changed the Import form's 'Browse the server' label to 'Browse your computer' 2010-07-08 13:50:46 -07:00
lorilee
edc8846de8 Changed the default CSV column separator from a comma to a semi-colon 2010-07-08 13:41:15 -07:00
lorilee
a62cc4d464 Changed "columns terminated with" to "columns separated with" 2010-07-08 13:40:50 -07:00
lorilee
c05038e847 Added a title to the import page to show the current import mode (server/database/table) 2010-07-08 12:37:10 -07:00
lorilee
e90f8e4d89 Added a title to the export page to show the current export mode (server/database/table) 2010-07-08 12:30:50 -07:00
lorilee
af5486fccc Moved inline css from display_export.lib.php here 2010-07-08 12:01:16 -07:00
lorilee
2a046d7b08 Removed inline css, added labels to form elements, modified file template message to make it less confusing 2010-07-08 11:57:59 -07:00
lorilee
0692c8f0b7 Disabled "Dump some row(s)" sub-options when they are not selected, fixed comments, minor refactoring 2010-07-08 11:55:21 -07:00
ninadsp
8358b8c8d3 Reverted po files changes. 2010-07-08 22:53:26 +05:30
Marc Delisle
90ce4c77b3 clarify code 2010-07-08 08:29:27 -04:00
Marc Delisle
c1be602a1e fix merge conflicts 2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894 bug #3026400 [PHP] ereg functions are deprecated 2010-07-08 07:49:11 -04:00
Marc Delisle
638fe75a8b fix merge conflict 2010-07-07 09:47:12 -04:00
Marc Delisle
104b0ee99a remove reference to some old stuff 2010-07-07 09:44:44 -04:00
ninadsp
020dac8c89 Merge remote branch 'origin/master' 2010-07-07 18:53:41 +05:30
ninadsp
8de1f2fdf7 Revert "Trying to resolve a merge." 
This reverts commit fdd8b51b00.
 2010-07-07 18:36:28 +05:30
ninadsp
fdd8b51b00 Trying to resolve a merge. 2010-07-07 18:32:41 +05:30
ninadsp
47142291a1 Merge remote branch 'origin/master' 
Conflicts:
	po/af.po
	po/ar.po
	po/az.po
	po/be.po
	po/be@latin.po
	po/bg.po
	po/bn.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/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/uk.po
	po/ur.po
	po/uz.po
	po/uz@latin.po
	po/zh_CN.po
	po/zh_TW.po
 2010-07-07 18:31:09 +05:30
Marc Delisle
f95dc8d8a1 Merge branch 'QA_3_3' 2010-07-07 07:04:04 -04:00
Marc Delisle
3d23bcf1da improve English 2010-07-07 07:03:31 -04:00
Marc Delisle
d4f6b5c4ba Merge branch 'QA_3_3' 2010-07-07 06:13:38 -04:00
Marc Delisle
8a153086a1 revert to previous value and add a comment in default configuration file 2010-07-07 06:13:06 -04:00
Marc Delisle
bd09ef50ff Merge branch 'QA_3_3' 2010-07-06 16:58:50 -04:00
Marc Delisle
9903c5f3d0 bug #3025975 [auth] Odd LoginCookieValidity default value 2010-07-06 16:58:13 -04:00
lorilee
3c1e06a3e6 Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc 2010-07-06 11:04:06 -07:00
lorilee
f06363811c Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-06 10:58:17 -07:00
Piotr Przybylski
573edc0329 patch #3025161 [core] Prevent sending of unnecessary cookies 2010-07-06 11:43:02 -04:00
Marc Delisle
11609bdf80 must specify dateFormat for jQuery UI datepicker, otherwise a wrong MM/DD/YYYY is passed to MySQL 2010-07-06 11:15:46 -04:00
lorilee
fb36521902 Corrected div name 2010-07-05 16:40:11 -07:00