Commit Graph

7303 Commits

Author SHA1 Message Date
Kasun Chathuranga
7261550e1a ChangeLog entry for PMA_DBI functions in database interface libraries renaming 2013-05-04 09:01:25 +05:30
Dieter Adriaenssens
f8ab975058 fix typo 2013-05-03 15:57:21 +02:00
Dieter Adriaenssens
22c98b6d9c Merge pull request #278 from kasunchathuranga/Feature1414
Implement feature request #1414 - Allow specifying controlport
2013-05-03 06:49:22 -07:00
Marc Delisle
12276b1ea6 Merge branch 'QA_4_0' 2013-05-03 08:13:57 -04:00
Marc Delisle
360878b6a9 Fix merge conflict 2013-05-03 08:13:50 -04:00
Madhura Jayaratne
8269077a44 Merge branch 'QA_4_0' 2013-05-03 15:31:45 +05:30
Madhura Jayaratne
b8be755f83 Merge branch 'QA_3_5' into QA_4_0
Conflicts:
	ChangeLog
2013-05-03 15:30:43 +05:30
Madhura Jayaratne
51bd5bfc87 There won't be a 3.5.9 release 2013-05-03 15:25:54 +05:30
Kasun Chathuranga
adb2e43f7d Implement feature request #1414 - Allow specifying crontrolport
Set the value of controlport based on the value of controlhost
2013-05-02 21:36:05 +05:30
Michal Čihař
555d35883f Changelog entry 2013-05-02 10:59:43 +02:00
Michal Čihař
458888808e Changelog entry 2013-05-02 10:58:38 +02:00
Michal Čihař
384f2cd79e Merge remote-tracking branch 'origin/QA_4_0'
Conflicts:
	js/pmd/history.js
	libraries/Config.class.php
2013-05-02 10:13:18 +02:00
J.M
0b3b113b39 [interface] Make warning about existing config directory clearer 2013-05-01 21:00:45 +02:00
J.M
2b0816375e Fix bug #3901 Setup script warning for config auth (stored login data) shows link BBcode 2013-05-01 20:47:08 +02:00
Kasun Chathuranga
d632dd9946 Merge branch 'master' into DBI_naming_cleanUp
Conflicts:
	ChangeLog
2013-05-01 21:33:52 +05:30
J.M
1347575ee7 Fix bug #3900 CSP WARN in Firefox console 2013-05-01 17:56:04 +02:00
Kasun Chathuranga
5af42f374e ChangeLog entry for PMA_DBI function renaming 2013-05-01 21:13:53 +05:30
J.M
7797da8387 Add Changelog entry for pull requests #297 and #299 2013-05-01 17:22:11 +02:00
J.M
04bc077291 Use indeterminate check all checkbox in server privileges 2013-05-01 16:44:35 +02:00
J.M
043aa1e14e Add Changelog entry for rfe #499 2013-05-01 15:21:37 +02:00
J.M
956cc18d39 bug #3899 Git commit links to Github missing, the Github API v3 is now enforcing User-Agent headers 2013-04-30 23:47:24 +02:00
J.M
1d00038a38 Update bug number for bug 3894 moved by @lem9 from rfes 2013-04-30 23:39:37 +02:00
J.M
f78cda80cd Merge branch 'origin/QA_4_0' 2013-04-30 18:02:06 +02:00
J.M
fc62e1f9f6 Merge branch 'origin/QA_4_0'
Conflicts:
	js/keyhandler.js
	js/tbl_structure.js
2013-04-30 17:46:36 +02:00
J.M
d61d62fce2 Merge branch 'origin/QA_4_0'
Conflicts:
	ChangeLog
2013-04-29 12:33:52 +02:00
J.M
0b63f7e6c8 Fix bug #3799 [interface] Incorrect select field change on ctrl key navigation in Firefox 2013-04-28 20:05:35 +02:00
J.M
b39fbb4d46 Fix bug #3885 display_binary_as_hex option causes unexpected behavior 2013-04-28 19:15:49 +02:00
J.M
14eb3c32ca Add rfe #1422 [interface] Provide feedback if no columns selected for multi-submit 2013-04-28 15:17:45 +02:00
J.M
4035c079e6 Merge branch 'origin/QA_4_0' 2013-04-28 13:15:20 +02:00
J.M
4fa8633474 Add rfe #1421 Add retry button on connection failure with config auth 2013-04-28 12:31:21 +02:00
Marc Delisle
6e88efd282 Fix merge conflicts 2013-04-27 16:43:04 -04:00
Marc Delisle
8acf00e7d8 Merge branch 'MAINT_4_0_0' into QA_4_0 2013-04-27 16:40:56 -04:00
J.M
ff2d22f639 Fix bug #3892 SQL Export files are empty 2013-04-27 22:10:50 +02:00
J.M
8bf86d9a7a Fix bug #3891 Server upload folder import file name missing in success message 2013-04-27 21:16:31 +02:00
J.M
1f7336f540 Fix bug #3890 [import] Web server upload directory import fails 2013-04-26 12:13:07 +02:00
J.M
00eb036db1 Add bug ID to changelog for bug 3889 2013-04-26 11:23:35 +02:00
Marc Delisle
bc0f804fb8 Fix merge conflicts 2013-04-25 21:32:04 -04:00
Marc Delisle
90a2ccbce5 ChangeLog entry for "Hide login data in backtrace" 2013-04-25 21:29:30 -04:00
Madhura Jayaratne
324e4dbe73 Merge branch 'QA_4_0'
Conflicts:
	ChangeLog
2013-04-25 20:54:51 +05:30
Madhura Jayaratne
79df30b327 Change log entry for bug fix for #3879 2013-04-25 20:49:47 +05:30
Marc Delisle
5a383c5be1 4.0.1-dev 2013-04-25 06:45:50 -04:00
Marc Delisle
849eeb4519 Fix merge conflicts 2013-04-24 08:58:07 -04:00
Marc Delisle
fa6ef14289 ChangeLog entries for security fixes 2013-04-24 08:51:22 -04:00
Marc Delisle
75925d8615 Merge branch 'QA_4_0' 2013-04-24 08:34:52 -04:00
Marc Delisle
1cf11c7f3d Fix merge conflicts 2013-04-24 08:34:37 -04:00
Marc Delisle
d7a5783b88 Fix merge conflicts 2013-04-24 08:23:44 -04:00
Marc Delisle
be9ec6d008 ChangeLog entries for security fixes 2013-04-24 08:15:36 -04:00
Marc Delisle
83a181ea01 Merge branch 'QA_4_0' 2013-04-15 16:26:27 -04:00
J.M
dfdee264c3 Fix bug #3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM 2013-04-15 16:25:43 -04:00
Marc Delisle
32cd9478d0 Merge branch 'QA_4_0' 2013-04-14 13:03:34 -04:00