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

161 Commits

Author SHA1 Message Date
Michal Čihař
40818833af Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5 2012-02-08 14:23:12 +01:00
Michal Čihař
b4296d6acb Escape in correct places to avoid double escaping sometimes 2012-02-08 14:22:39 +01:00
Marc Delisle
81d27b3593 RetainQueryBox in setup and user prefs 2012-01-07 07:38:00 -05:00
Marc Delisle
c555fc1b34 Fix merge conflicts 2011-12-14 08:00:51 -05:00
Michal Čihař
0e707906e6 [security] Self-XSS in setup (host parameter), see PMASA-2011-19 2011-12-13 12:42:39 -05:00
Michal Čihař
e448774704 Improve description of MaxTableUiprefs 2011-11-30 14:17:39 +01:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
Marc Delisle
c380102816 Setup for controlhost 2011-10-29 08:24:11 -04:00
Michal Čihař
e56949f160 Use package name PhpMyAdmin 
Needed to match phpdoc rules as package name must begin with upper case.
 2011-10-25 10:13:17 +02:00
Michal Čihař
bea61e9f48 Coding style 2011-10-24 17:28:18 +02:00
Michal Čihař
2c1970b48b Fix package 2011-10-24 17:25:16 +02:00
Michal Čihař
2518085d23 Wrap long line 2011-10-24 17:25:12 +02:00
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Rouslan Placella
306901394e Fixed usage of undefined function PMA_getImage() in setup script 2011-10-04 19:51:02 +01:00
Marc Delisle
c25b7c8966 Merge branch 'QA_3_4' 2011-10-04 06:20:48 -04:00
Marc Delisle
1af420e223 [security] Fixed XSS in setup (verbose parameter) 2011-10-04 06:20:17 -04:00
Rouslan Placella
d17814f463 Replaced use of hard coded images with the sprite-aware PMA_getImage() functions (both PHP and JS). 2011-09-26 20:54:59 +01:00
Piotr Przybylski
55d70a7fe1 This should be escaped 2011-09-20 13:02:54 +02:00
Madhura Jayaratne
5d3735b3b4 Merge branch 'QA_3_4' 2011-09-16 23:50:47 +05:30
Madhura Jayaratne
5511ae8fbc bug #3410604 [config] Configuration storage incorrect suggested table name 2011-09-16 23:45:36 +05:30
Dieter Adriaenssens
87459a5cf6 use include() instead of require() when including file conditionally 2011-09-06 22:04:51 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
1ea24eb083 Better variable name 2011-08-16 01:04:51 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle 
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
 2011-08-12 22:02:40 +02:00
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Dieter Adriaenssens
fd383934af Merge branch 'QA_3_4' 2011-08-10 20:58:45 +02:00
Dieter Adriaenssens
556636457a Remove library PHPExcel, due to license issues 
Remove native Excel exportand import modules (xls and xlsx formats)
 2011-08-10 20:53:51 +02:00
Aris Feryanto
ca0aa169c0 Fix merge conflict with grid branch 2011-08-08 15:48:51 +08:00
Aris Feryanto
ba7913a260 Remove inline edit feature 2011-08-08 14:07:59 +08:00
Aris Feryanto
0e39df6ca4 add configuration in 'user preferences' and 'setup' to show/hide the Hint created with PMA_createqTip function 2011-08-04 16:27:47 +08:00
Piotr Przybylski
dfec5a4732 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-01 18:05:53 +02:00
Aris Feryanto
11e1ead21c Merge remote-tracking branch 'origin/master' into aris 2011-08-01 17:22:44 +08:00
Piotr Przybylski
0a4ddb3f67 Remove unused function: PMA_lang_link_replace 2011-07-31 20:41:03 +02:00
Piotr Przybylski
878cff0205 Comments 2011-07-31 20:41:03 +02:00
Piotr Przybylski
d7bea4d4ee Merge remote-tracking branch 'origin/master' into drizzle 2011-07-31 17:26:18 +02:00
Piotr Przybylski
9b01642c95 Fix test_db_connection() for connections via socket 2011-07-31 15:16:07 +02:00
Piotr Przybylski
e1799393f3 Validation for drizzle module in setup script 
Untested and currently unused, it's too unsafe to allow users to choose it
 2011-07-31 00:50:58 +02:00
Aris Feryanto
b81acce4c9 Merge remote-tracking branch 'origin/master' into grid 2011-07-27 10:16:53 +08:00
Aris Feryanto
c3547776a7 Merge remote-tracking branch 'origin/master' into aris 2011-07-27 10:16:26 +08:00
Aris Feryanto
4b0cd86ea7 Merge branch 'grid' into aris 2011-07-26 18:30:51 +08:00
Aris Feryanto
cb090c7e21 Grid edit: add configuration to save edited cell(s) at once 2011-07-26 18:30:40 +08:00
Michal Čihař
17cd1ebe2b Use single function for bbcode implementation 2011-07-25 12:11:17 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
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
Marc Delisle
b2d8e0b60f Clarify directive name: ShowDisplayDir -> ShowDisplayDirection 2011-07-13 09:19:38 -04:00
Tyron Madlener
2ee9f03cbb Merge remote-tracking branch 'origin/master' into tyronm 2011-07-05 18:09:55 +02:00
Aris Feryanto
c4ee218fb5 Navigation bar: more compact, display horizontal/vertical mode only when configured 2011-07-01 11:31:30 +08:00