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

6871 Commits

Author SHA1 Message Date
Thomas Hergenhahn
7cd6894257 patch #3432835 [interface] Add useful intermediate pages to pageselector 2011-11-12 10:15:12 -05:00
Michal Čihař
c672292268 rfe #1632106 [interface] Improved error handling 2011-11-10 15:44:00 +01:00
Marc Delisle
f42d162b0d 3.4.7.1 release 2011-11-10 09:09:49 -05:00
Marc Delisle
849b6818f8 3.4.7.1 release 2011-11-10 09:09:17 -05:00
Marc Delisle
839c0d493a Merge branch 'QA_3_4' 2011-11-10 09:00:13 -05:00
Marc Delisle
e51a1cb73d ChangeLog for 3.4.7.1 2011-11-10 08:59:03 -05:00
Aris Feryanto
d61769c133 Added Changelog entry 2011-11-09 00:33:34 +08:00
Aris Feryanto
2dfd1dca14 Added Changelog entry 2011-11-09 00:33:11 +08:00
Rouslan Placella
a00fc340f9 Merge branch 'menubar' 2011-11-05 14:36:08 +00:00
Marc Delisle
a7ea657625 Merge branch 'QA_3_4' 2011-11-05 10:33:45 -04:00
Gabor Gyorvari
8721f7b160 patch #3430291 [import] Handle conflicts in some open_basedir situations 2011-11-05 10:33:19 -04:00
Rouslan Placella
26b869a254 Updated changelog 2011-11-05 14:15:46 +00:00
Marc Delisle
02d5799893 Fix merge conflicts 2011-11-05 10:00:50 -04:00
Robert Scheck
8170d03d3c Patch by Robert Scheck <robert@fedoraproject.org> 
for phpMyAdmin >= 3.4.7, which makes the php-gettext
library that is used configurable, which is helpful or even required for
some vendors or downstreams. The default is the internal library to keep
backward compatibility. More details can be found at SourceForge:
https://sourceforge.net/tracker/?func=detail&aid=3433770&group_id=23067&atid=377410
 2011-11-05 09:57:28 -04:00
Marc Delisle
0b16d690d2 Fix merge conflicts 2011-11-02 12:41:13 -04:00
Marc Delisle
d22fae4201 bug #3428065 [parser] TRUE not recognized by parser 2011-11-02 12:39:43 -04:00
Marc Delisle
6a5af526bb Fix merge conflicts 2011-11-02 07:42:59 -04:00
Marc Delisle
0b24e69435 bug #3426836 [interface] Visual column separation 2011-11-02 07:33:01 -04:00
Marc Delisle
028e9ee6d9 Merge branch 'QA_3_4' 2011-10-31 12:35:12 -04:00
Marc Delisle
a691fce64c bug #3428627 [import] ODS import ignores memory limits 2011-10-31 12:35:02 -04:00
Rouslan Placella
4547ca37f4 Removed an unncessary AJAX request from database search 2011-10-30 16:14:20 +00:00
Rouslan Placella
c52063d283 Merge branch 'QA_3_4' 
Conflicts:
	js/db_search.js
 2011-10-30 14:32:29 +00:00
Rouslan Placella
f7cb55cb62 Fixed bug #3430377 - Deleted search results remain visible 2011-10-30 14:30:08 +00:00
Marc Delisle
6f7ca79218 patch #3410688 [interface] Improving field size for character columns 2011-10-30 05:35:00 -04:00
Marco Gergele
af8a61f73c patch #3428376 [pmadb] pmadb on a different MySQL server 2011-10-29 07:55:39 -04:00
Marc Delisle
240cb2418c 2010 ChangeLog moved to history repo 2011-10-28 09:08:46 -04:00
Rouslan Placella
42720eb9fe Changelog entry for the improved ENUM/SET editor 2011-10-26 18:20:33 +01:00
Marc Delisle
ecb05de4f6 Fix merge conflicts 2011-10-23 10:33:01 -04:00
Marc Delisle
694c1cdf75 bug #3427256 [interface] no links to browse/empty views and tables 2011-10-23 10:27:06 -04:00
Marc Delisle
c067410371 Merge branch 'QA_3_4' 2011-10-23 08:11:23 -04:00
Marc Delisle
d590bccda2 3.4.7 2011-10-23 08:10:47 -04:00
Rouslan Placella
0683bd485b Merge branch 'QA_3_4' 2011-10-21 15:40:58 +01:00
Rouslan Placella
0112ff6ba5 Fixed bug #3426840 - ENUM/SET editor can't handle commas in values 2011-10-21 15:38:59 +01:00
Rouslan Placella
20a57d1fea Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
 2011-10-21 11:38:38 +01:00
Rouslan Placella
d4cce87b26 Fixed bug #3425230 - enum data split at space char (more space to edit) 2011-10-21 11:34:42 +01:00
Marc Delisle
4cba6ee2dc 3.4.8-dev 2011-10-19 16:58:54 -04:00
Marc Delisle
a3132f6e91 3.4.8-dev 2011-10-19 16:58:10 -04:00
Marc Delisle
c76d9fea3a Merge branch 'QA_3_4' 2011-10-19 13:15:05 -04:00
Marc Delisle
ec99ab3e00 bug #3426031 [export] Export to bzip2 is not working 2011-10-19 13:11:22 -04:00
Michal Čihař
88c5f90e53 Merge branch 'QA_3_4' 
Conflicts:
	libraries/core.lib.php
	libraries/sanitizing.lib.php
 2011-10-18 12:46:24 +02:00
Michal Čihař
8b9e7c1279 bug #3425184 [doc] Fix links to PHP documentation 2011-10-18 12:44:32 +02:00
Michal Čihař
3535dcfec3 Merge remote-tracking branch 'origin/QA_3_4' 2011-10-18 11:53:40 +02:00
Michal Čihař
3fa0b1f639 [core] Allow to set language in URL 2011-10-18 11:51:24 +02:00
Marc Delisle
ba2159baca Merge branch 'QA_3_4' 2011-10-16 06:22:18 -04:00
Marc Delisle
f3f9122c67 3.4.6 release 2011-10-16 06:21:52 -04:00
Madhura Jayaratne
a478b8164d bug #3299486 [prettyprint] Order By in a query containing comment character 2011-10-15 16:23:31 +05:30
Madhura Jayaratne
acf2a3b472 Merge branch 'QA_3_4' 
Conflicts:
	libraries/export/pdf.php
 2011-10-14 20:21:09 +05:30
Madhura Jayaratne
77ad710d08 bug #3423725 [pdf] Broken PDF file when exporting database to PDF 2011-10-14 20:17:25 +05:30
Marc Delisle
d297e0b574 Merge branch 'QA_3_4' 2011-10-11 07:45:42 -04:00
Marc Delisle
4a99b6a494 bug #3420229 [doc] Missing documentation section 2011-10-11 07:45:26 -04:00
Marc Delisle
b5e63b56a9 Fix merge conflicts 2011-10-10 08:54:44 -04:00
Marc Delisle
a6fc7ac928 bug [navi] Wrong icon for view (MySQL 5.5) 2011-10-10 08:49:41 -04:00
Marc Delisle
328defc9d9 bug [view] View renaming did not work 2011-10-10 07:25:52 -04:00
Marc Delisle
6fec80c614 bug [view] View renaming did not work 2011-10-10 07:16:30 -04:00
Marc Delisle
d1aa3e3b02 [interface] Remove DefaultPropDisplay feature 2011-10-08 06:40:10 -04:00
Madhura Jayaratne
75c4a2ed45 Merge branch 'QA_3_4' 
Conflicts:
	js/sql.js
 2011-10-05 20:22:47 +05:30
Madhura Jayaratne
ad5c7f5d0a bug #3418849 [interface] Inline edit shows dropdowns even after closing 2011-10-05 08:55:19 +05:30
Madhura Jayaratne
0cacdc7fca Merge branch 'QA_3_4' 
Conflicts:
	libraries/navigation_header.inc.php
 2011-10-05 00:42:56 +05:30
Madhura Jayaratne
f7a31e5f4c bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false 2011-10-05 00:34:56 +05:30
Dieter Adriaenssens
8adddca21f Merge branch 'QA_3_4' 2011-10-04 19:16:10 +02:00
Dieter Adriaenssens
e234958545 Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-04 19:15:42 +02:00
Dieter Adriaenssens
ca597dc423 [security] Fixed XSS in setup (host parameter), see PMASA-2011-16 2011-10-04 19:15:19 +02:00
Marc Delisle
c25b7c8966 Merge branch 'QA_3_4' 2011-10-04 06:20:48 -04:00
Marc Delisle
bc5aa87ae9 Merge branch 'MAINT_3_4_6' into QA_3_4 2011-10-04 06:20:28 -04:00
Marc Delisle
1af420e223 [security] Fixed XSS in setup (verbose parameter) 2011-10-04 06:20:17 -04:00
Dieter Adriaenssens
d35cba9808 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:44:43 +02:00
Dieter Adriaenssens
fbaa5cc1a1 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:44:05 +02:00
Dieter Adriaenssens
e05b37d3c9 Fixed local path disclosure vulnerability, see PMASA-2011-15 2011-10-03 20:38:36 +02:00
Marc Delisle
2ff7b4cc93 Fix merge conflicts 2011-10-03 12:42:35 -04:00
Marc Delisle
b939d1048e 3.4.7-dev is starting 2011-10-03 12:41:20 -04:00
Marc Delisle
2c7b06f543 Merge branch 'QA_3_4' 2011-10-02 07:35:54 -04:00
Marc Delisle
e27961b1b2 bug #3417089 [synchronize] Extraneous db choices 2011-10-02 07:25:45 -04:00
Marc Delisle
96bf96d422 Merge branch 'QA_3_4' 2011-09-29 12:48:03 -04:00
Hans Fr. Nordhaug
6c980106b7 patch #3314626 [display] CharTextareaRows is not respected 2011-09-29 12:47:48 -04:00
Madhura Jayaratne
e96b059dfa Merge branch 'QA_3_4' 2011-09-29 19:45:48 +05:30
Madhura Jayaratne
a9f2c38942 bug #3414744 [core] External link fails in 3.4.5 2011-09-29 19:43:28 +05:30
Marc Delisle
86138fa914 Merge branch 'QA_3_4' 2011-09-29 07:06:48 -04:00
Marc Delisle
acbbd8fc56 bug #3392150 [schema] PMA_User_Schema::processUserChoice() is broken 2011-09-29 06:41:06 -04:00
Madhura Jayaratne
0ad7567d3f Merge branch 'QA_3_4' 2011-09-28 18:20:07 +05:30
Madhura Jayaratne
37dff12901 bug #3390832 [display] Delete records from last page breaks search 2011-09-28 18:17:39 +05:30
Madhura Jayaratne
192b534b95 bug #3356456 [interface] Interface problems for queries having LIMIT clauses 2011-09-28 15:30:13 +05:30
Madhura Jayaratne
2aec106b90 Merge branch 'QA_3_4' 
Conflicts:
	tbl_relation.php
 2011-09-27 21:11:10 +05:30
Madhura Jayaratne
2e101cc733 bug #3412862 [relation] Relations/constraints are dropped/created on every change 2011-09-27 21:06:21 +05:30
Piotr Przybylski
a429734b63 Merge branch 'QA_3_4' 2011-09-25 17:47:20 +02:00
Piotr Przybylski
66adfdef30 Forgot changelog entry for bug #3324161 2011-09-25 17:47:06 +02:00
Marc Delisle
1c48e6a817 Merge branch 'QA_3_4' 2011-09-25 07:45:59 -04:00
Marc Delisle
1eeddcd082 bug #3413743 [interface] Display options link missing after search 2011-09-25 07:45:23 -04:00
Marc Delisle
efa9eeb558 Merge branch 'QA_3_4' 2011-09-24 06:03:54 -04:00
Marc Delisle
5b2befc171 bug #3411633 [core] Call to undefined function PMA_isSuperuser() 2011-09-24 06:03:25 -04:00
Madhura Jayaratne
95e6e0b447 Merge branch 'QA_3_4' 
Conflicts:
	libraries/display_tbl.lib.php
 2011-09-19 23:28:24 +05:30
Madhura Jayaratne
a211b8ba0e bug #3411224 [display] Broken binary column when 'Show binary contents' not set 2011-09-19 23:17:13 +05:30
Madhura Jayaratne
5cae094164 Merge branch 'QA_3_4' 2011-09-19 23:08:32 +05:30
Madhura Jayaratne
63d164ca99 bug #3411535 [display] Full text button unchecks results display options 2011-09-19 23:07:42 +05:30
Marc Delisle
5e83631469 Fix merge conflicts 2011-09-18 08:26:47 -04:00
Marc Delisle
6ac29b4791 bug #3383572 [interface] Cannot execute saved query 
When the Go button related to the "Run SQL query" section is pressed,
avoid transmitting the value of id_bookmark from the "Bookmarked SQL
query" section; otherwise import.php would think that it needs to
do a bookmark action instead of executing the query.
 2011-09-18 08:11:15 -04: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
Madhura Jayaratne
3d3a5283dc Merge branch 'QA_3_4' 2011-09-14 22:50:54 +05:30
Madhura Jayaratne
d3bd40b56d bug #3400690 [privileges] DB-specific privileges won't submit 
Db/table specific privileges has not been ajaxified. So skip it for now.
 2011-09-14 22:43:48 +05:30
Marc Delisle
6b09880e1c 3.4.5 release 2011-09-14 07:44:30 -04:00
Marc Delisle
e27ba519c5 3.4.5 release 2011-09-14 07:44:09 -04:00
Marc Delisle
003d879a64 Merge branch 'QA_3_4' 2011-09-11 06:51:29 -04:00
Marc Delisle
03a75ab9e0 bug #3399951 [export] Config for export compression not used 2011-09-11 06:51:09 -04:00
Madhura Jayaratne
a67e233fa7 Merge branch 'QA_3_4' 
Conflicts:
	tbl_structure.php
 2011-09-10 11:13:49 +05:30
Madhura Jayaratne
4232fcd458 bug #3403165 [interface] Collation not displayed for long enum fields 2011-09-10 10:47:37 +05:30
Madhura Jayaratne
9d4e9efe4b Merge branch 'QA_3_4' 2011-09-10 08:47:35 +05:30
Madhura Jayaratne
7e7e55b953 bug #3404886 [navi] Edit SQL statement after error 2011-09-10 08:43:13 +05:30
Marc Delisle
b0ef11932a Merge branch 'QA_3_4' 2011-09-08 15:44:07 -04:00
Marc Delisle
c5a6419618 Merge branch 'MAINT_3_4_5' into QA_3_4 2011-09-08 15:41:40 -04:00
Marc Delisle
bda213c58a Escape HTML in js-generated confirmation messages 2011-09-08 15:38:40 -04:00
Marc Delisle
f1fbb2bb8c Merge branch 'QA_3_4' 2011-09-07 07:37:23 -04:00
Marc Delisle
c02bd600ee ChangeLog for patch #3404173 2011-09-07 07:37:05 -04:00
Herman van Rink
2f28ce9c80 [security] Fixed XSS in Inline Edit on save action 2011-09-02 13:00:33 -04:00
Marc Delisle
2dba1449bd 3.4.6-dev 2011-09-02 12:44:02 -04:00
Marc Delisle
1b5461dc75 3.4.6-dev 2011-09-02 12:42:55 -04:00
Piotr Przybylski
9ec3c36f58 Changelog 2011-08-24 21:47:55 +02:00
Marc Delisle
2e1d5ac20a ChangeLog and 3.4.4 XSS fix 2011-08-24 12:39:43 -04:00
Marc Delisle
4e89311089 ChangeLog and 3.4.4 XSS fix 2011-08-24 12:38:50 -04:00
Marc Delisle
7e814a711a Merge branch 'QA_3_4' 2011-08-19 16:17:25 -04:00
Marc Delisle
29b694c225 bug #3392920 [edit] BLOB emptied after editing another column 2011-08-19 16:16:51 -04:00
Madhura Jayaratne
79b5bd602e Changelog entries for GIS features 2011-08-17 19:14:43 +05:30
Marc Delisle
9147f30dc6 Zoom-search in table Search 2011-08-12 14:44:55 -04: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
Marc Delisle
858e2a0751 Grid editing in browse mode (replaces row inline edit) 2011-08-10 09:48:42 -04:00
Marc Delisle
79672532c4 bug #3380946 [export] no uid Query result export (Suhosin limit) 2011-08-08 10:39:40 -04:00
Madhura Jayaratne
da9d10a3ef Typo 2011-08-08 10:21:54 +05:30
Madhura Jayaratne
ff6b491a63 Typo 2011-08-07 18:49:34 +05:30
Madhura Jayaratne
a137097f20 Wrong ChangeLog entry 2011-08-07 18:41:04 +05:30
Madhura Jayaratne
275637daa2 ChangeLog entry for patch #3385954 2011-08-07 18:33:13 +05:30
Michal Čihař
4afb63d08f Upgrade to jQuery 1.6.2 
This should be compatible with 1.6.1 and my tests show no problems.
 2011-08-05 15:31:38 +02:00
Michal Čihař
d9435a050a Merge remote-tracking branch 'origin/QA_3_4' 2011-08-05 13:55:53 +02:00
Michal Čihař
20298630ed Changelog entry 2011-08-05 13:55:38 +02:00
Madhura Jayaratne
55c6eacf3e Merge branch 'QA_3_4' 2011-08-04 00:07:04 +05:30
Madhura Jayaratne
68e21b05e4 Changelog entry for bug #3383711. Some formatting 2011-08-04 00:04:16 +05:30
Marc Delisle
663d073e6b ChangeLog entry 2011-08-02 12:32:51 -04:00
Michal Čihař
78fdc7d3f4 Merge commit 'c17add38ed40312f934451e1d1cf1f0b0ef8240e' 
Conflicts:
	js/sql.js
 2011-08-02 16:21:56 +02:00
Rouslan Placella
c17add38ed Fixed bug #3374802 - Comment on a column breaks inline editing 2011-08-02 16:15:39 +02:00
Madhura Jayaratne
808447af1e Merge branch 'QA_3_4' 2011-07-29 06:39:58 +05:30
Madhura Jayaratne
11ad4fd992 bug #3313235 [interface] Error div misplaced 2011-07-29 06:38:07 +05:30
Rouslan Placella
ad4975b82d Merge branch 'QA_3_4' 
Conflicts:
	ChangeLog
	Documentation.html
	README
	libraries/Config.class.php
 2011-07-26 14:39:20 +01:00
Rouslan Placella
402a832e93 Fixed bug #3375325 - Page list in navigation frame looks odd 2011-07-26 14:35:47 +01:00
Marc Delisle
4d19ddaf08 3.4.5 started 2011-07-25 10:11:02 -04:00
Marc Delisle
cc99e04055 3.4.5 started 2011-07-25 10:08:10 -04:00
Marc Delisle
35a5f31283 Merge branch 'QA_3_4' 2011-07-24 08:08:51 -04:00
Marc Delisle
08ee54d4a4 bug #3358750 [core] With Suhosin, urls are too long in edit links 2011-07-24 08:08:38 -04:00
Marc Delisle
7e197b695e Fix merge conflicts 2011-07-23 08:25:49 -04:00
Marc Delisle
3534dda30a Fix merge conflicts 2011-07-23 08:16:00 -04:00
Marc Delisle
bd63726ee3 3.4.3.2 release date 2011-07-23 08:12:06 -04:00
Marc Delisle
5bc41ef1dc ChangeLog for "AJAX for table Structure column Add" 2011-07-22 14:34:46 -04:00