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

5240 Commits

Author SHA1 Message Date
Herman van Rink
9c4fd802ab Merge remote branch 'origin/master' into unittesting 2011-07-19 22:09:28 +02:00
Michal Čihař
dce30ddee1 Merge branch 'master' into integration 2011-07-19 14:23:11 +02:00
Michal Čihař
0eb853b250 Delete wrongly merged files 2011-07-19 14:23:04 +02:00
Michal Čihař
e2dff46f79 There is no result here 2011-07-19 13:50:57 +02:00
Piotr Przybylski
3acae146b9 Use default engine for tables created during data import 2011-07-18 23:37:14 +02:00
Michal Čihař
1b5691656e Use PMA_DBI_get_columns instead of own query 2011-07-18 10:27:50 +02:00
Michal Čihař
f48846cbc0 Document why eval is used 2011-07-18 10:18:31 +02:00
Michal Čihař
ba9e74bb85 Function file_get_contents is available since PHP 4.3.0, no need to check for it 2011-07-18 10:17:46 +02:00
Michal Čihař
6c45a67d88 Update references, remove non existing ones 2011-07-18 10:10:17 +02:00
Michal Čihař
d867d7787d Remove commented out code 2011-07-18 10:09:03 +02:00
Michal Čihař
0d4ccd012d Use old_offset instead of strlen 
It is really not needed to use real data as we have the offset stored
anyway.
 2011-07-18 10:06:31 +02:00
Rouslan Placella
47f4e0772d Better validation of parameter types when generating a CREATE ROUTINE query 2011-07-16 19:35:02 +01:00
Rouslan Placella
bdb3423bc9 Validate parameter direction when generating a CREATE PROCEDURE query 2011-07-16 19:34:17 +01:00
Rouslan Placella
d8b14b5dc7 Removed redundant whitespaces from CREATE ROUTINE query 2011-07-16 19:33:08 +01:00
Rouslan Placella
6d714e5d7d E_ALL fix when generating CREATE ROUTINE query from empty request 2011-07-16 19:32:29 +01:00
Rouslan Placella
28881e4f4a Simplified check for maximum number of routine parameters 2011-07-16 19:31:36 +01:00
Rouslan Placella
62859c653e Merge branch 'master' into rte 
Conflicts:
	libraries/rte/rte_events.lib.php
	libraries/rte/rte_routines.lib.php
	libraries/rte/rte_triggers.lib.php
 2011-07-15 20:41:58 +01:00
Rouslan Placella
7a31e75eb6 Merge branch 'QA_3_4' 
Conflicts:
	libraries/export/codegen.php
	libraries/export/xml.php
 2011-07-15 16:10:24 +01:00
Rouslan Placella
40d7c3b8ba tabs -> spaces 2011-07-15 16:02:37 +01:00
Herman van Rink
9c7d2bf9a7 Merge remote-tracking branch 'origin/master' into unittesting 2011-07-15 10:31:52 +02:00
Piotr Przybylski
2cc22c8aba Fix CodeGen export 2011-07-14 23:48:17 +02:00
Piotr Przybylski
70083ad583 Fix XML export so it actually can export table structure 
More escaping fixes
 2011-07-14 23:43:56 +02:00
Piotr Przybylski
65d962d397 Better escaping in XML export 
Note: it's still incorrect
 2011-07-14 23:40:58 +02:00
Piotr Przybylski
6d0f28b425 Improve readability of XML export code 2011-07-14 23:38:09 +02:00
Piotr Przybylski
291e3b6a9f Use PMA_DBI_get_columns in texytext export 2011-07-14 22:32:04 +02:00
Piotr Przybylski
bdbb888713 Use PMA_DBI_get_columns in odt export 2011-07-14 22:27:56 +02:00
Piotr Przybylski
8ff9a1bb78 Whitespace 2011-07-14 21:31:46 +02:00
Piotr Przybylski
ff7116bf7e Fix CodeGen export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
4ec9c3b09c Use PMA_DBI_get_columns in mediawiki export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
f1bcbb500a Use PMA_DBI_get_columns in latex export 2011-07-14 21:31:45 +02:00
Piotr Przybylski
94b83dc3e9 Escape column name in PMA_DBI_get_columns_full 2011-07-14 21:31:45 +02:00
Tyron Madlener
a5df22ced5 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/jquery/jquery-ui-1.8.override.css
 2011-07-14 17:23:35 +03:00
Marc Delisle
b44ece2949 Create a new is redundant 2011-07-14 09:20:34 -04:00
Rouslan Placella
526419d1a1 Renamed some functions to avoid conflicts of redefinition in unit tests 2011-07-14 13:57:05 +01:00
Rouslan Placella
f989d6f0cf Fixed handling of length/values for the return variable of functions 2011-07-14 13:06:31 +01:00
Rouslan Placella
9ca378d794 Merge branch 'rte' 2011-07-14 12:57:31 +01:00
Rouslan Placella
0e622faed6 Removed redundant code from rte_routines.lib.php 2011-07-14 12:57:09 +01:00
Piotr Przybylski
ad87dcf884 Removed useless code 2011-07-14 01:48:13 +02:00
Piotr Przybylski
bce8eaf40a JSON export plugin: fix syntax for empty table, better data escaping 2011-07-14 01:44:41 +02:00
Piotr Przybylski
059ddeb797 Better db and table name escaping in codegen and htmlword export plugins 2011-07-14 01:43:30 +02:00
Piotr Przybylski
590059cc30 Fix db/table name escaping in UI preferences 2011-07-14 01:30:25 +02:00
Piotr Przybylski
151799f17f Properly escape database name 2011-07-14 00:41:11 +02:00
Piotr Przybylski
d84d51c775 Fix XML export so it actually can export table structure 
More escaping fixes
 2011-07-14 00:05:58 +02:00
Piotr Przybylski
667cf67954 Better escaping in XML export 
Note: it's still incorrect
 2011-07-13 23:50:22 +02:00
Piotr Przybylski
09e74a9415 Improve readability of XML export code 2011-07-13 23:40:58 +02:00
Rouslan Placella
d3fa11c19b Move declarations of globals into functions, so that unit tests are possible 2011-07-13 18:42:10 +01: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
Michal Čihař
ae780330e8 Add missing semicolon 2011-07-13 17:05:34 +02:00