webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity
76,679 Commits 12 Branches 481 Tags
a3d7a055ee2efaa5c1713642affb8ee9113d142d
Commit Graph

7013 Commits

Author SHA1 Message Date
Rouslan Placella
bf219df66d Merge branch 'QA_3_5' 
Conflicts:
	enum_editor.php
 2012-06-11 14:01:46 +01:00
Rouslan Placella
ddd1eac480 Fixed bug #3534311 - Grid editing incorrectly parses ENUM/SET values 2012-06-11 14:00:18 +01:00
Rouslan Placella
8f698c7c82 Merge branch 'QA_3_5' 2012-06-10 14:47:10 +01:00
Rouslan Placella
b1855ec0b4 Fixed bug #3534121 - duplicate line in config.sample.inc.php 2012-06-10 14:46:55 +01:00
Rouslan Placella
9b9bd239c3 Merge branch 'QA_3_5' 
Conflicts:
	js/functions.js
	js/server_privileges.js
 2012-06-03 02:08:46 +01:00
Rouslan Placella
1368ff772e Fixed bug #3531586 - Add user form prints JSON when user presses enter 2012-06-03 01:50:28 +01:00
Rouslan Placella
a1eb7f30f4 Fixed bug #3531585 - Broken password validation in copy user form 2012-06-03 01:42:49 +01:00
Rouslan Placella
dbeaeeb7e2 Fixed bug #3531584 - No form validation in change password dialog 2012-06-03 01:20:23 +01:00
Marc Delisle
5c53fb643a Fix merge conflicts 2012-05-24 12:34:15 -04:00
Marc Delisle
07513a599d ChangeLog entry 2012-05-24 07:53:23 -04:00
Michal Čihař
f447066be6 Merge remote-tracking branch 'origin/QA_3_5' 2012-05-15 14:21:04 +02:00
Michal Čihař
4a141a067c bug #3523499 [core] Make X-WebKit-CSP work better 
This seems to work fine in Epiphany and Chromium, I don't have other
browsers to test.
 2012-05-15 14:17:19 +02:00
Marc Delisle
f2d19ef568 Fix merge conflicts 2012-05-05 06:59:51 -04:00
Marc Delisle
533ec68a62 ChangeLog entry for pull request #55 2012-05-05 06:36:45 -04:00
Yuichiro Takahashi
5088e86fd1 Fix popup message on build SQL of import 2012-05-05 18:21:55 +09:00
Marc Delisle
43cddc12a8 Merge branch 'QA_3_5' 2012-05-03 12:34:27 -04:00
Marc Delisle
d212e1a3ea Fix merge conflicts 2012-05-03 12:34:08 -04:00
Marc Delisle
5006c7c07a Merge branch 'QA_3_5' 2012-05-02 10:54:42 -04:00
Marc Delisle
8147dee382 bug #3522930 [browse] Missing validation in Ajax mode 2012-05-02 10:54:27 -04:00
Rouslan Placella
ef61abc9f1 Merge branch 'QA_3_5' 2012-05-01 23:46:22 +01:00
Rouslan Placella
83b5e569a2 Fixed invalid HTML code on transformation_overview.php 2012-05-01 23:45:30 +01:00
Marc Delisle
8648754a48 2011 entries moved to history repo 2012-05-01 15:59:09 -04:00
Marc Delisle
d3a43a48dd Merge branch 'QA_3_5' 2012-05-01 10:38:33 -04:00
Marc Delisle
d26d269a41 bug #3521016 [edit] NOW() function incorrectly selected 2012-05-01 10:38:18 -04:00
Alex Marin
bb4e9695c4 ChangeLog entry for import mediawiki 2012-05-01 02:03:03 +03:00
Marc Delisle
97bdb4c375 Merge branch 'QA_3_5' 2012-04-27 16:25:30 -04:00
Marc Delisle
060a16f448 bug #3521313 [core] Call to undefined function __() 
(backport part of fix from 6a2afedda0)
 2012-04-27 16:24:29 -04:00
Marc Delisle
b4f51cada5 Remove ReplaceHelpImg directive; this is a behavior that belongs to the themes 2012-04-27 15:44:20 -04:00
Marc Delisle
28d45840ac Remove VerboseMultiSubmit configuration directive 2012-04-26 12:37:07 -04:00
Rouslan Placella
4c72c0e91f Ajaxified "Create View" functionality 2012-04-25 23:47:49 +01:00
Rouslan Placella
ebb5a21045 Merge branch 'QA_3_5' 2012-04-25 21:06:18 +01:00
Rouslan Placella
403fd46818 Fixed bug #3521416 - JS error when editing index 2012-04-25 21:05:41 +01:00
Marc Delisle
503e45aba5 Fix merge conflicts 2012-04-25 12:29:55 -04:00
Rouslan Placella
55aaeb19cb Changelog entry for "Display description of datatypes" 2012-04-25 13:08:15 +01:00
Marc Delisle
b3a7232c86 Fix merge conflicts 2012-04-24 07:34:57 -04:00
Marc Delisle
abf645b0a3 3.5.2-dev 2012-04-24 07:33:31 -04:00
Marc Delisle
f804fe5cfb ChangeLog entry 2012-04-22 07:45:02 -04:00
Marc Delisle
da0e04d179 Fix merge conflicts 2012-04-21 16:37:50 -04:00
Marc Delisle
a26aec4d80 bug #3516089 [structure] DROP does not work on defective VIEWs 2012-04-21 16:29:05 -04:00
Madhura Jayaratne
f203b456b2 Merge branch 'QA_3_5' 
Conflicts:
	js/server_status_monitor.js
 2012-04-21 22:45:38 +05:30
Madhura Jayaratne
d7ca655efa Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 
Conflicts:
	ChangeLog
 2012-04-21 22:40:15 +05:30
Madhura Jayaratne
faeffd3566 bug #3520107 [interface] Server status page: Incorrect dialog box title 2012-04-21 22:20:19 +05:30
Marc Delisle
b6925193d6 Remove SuggestDBName configuration directive 2012-04-21 08:21:28 -04:00
Jo Michael
1b71d9d26a Hide language select box if there are no locales installed 2012-04-20 20:53:32 +02:00
Marc Delisle
f9e321bf80 Merge branch 'QA_3_5' 2012-04-20 06:39:12 -04:00
Marc Delisle
2299e4c6fe ChangeLog entry for bug #3519747 (backport 085111e9 from master to QA_3_5) 2012-04-20 06:38:17 -04:00
Jo Michael
c0329abd23 rfe #3518852 [edit] edit blob but not other binary, new option $cfg['ProtectBinary'] = 'noblob' 2012-04-19 22:32:51 +02:00
Michal Čihař
74de151cf4 Add ChangeLog entries 2012-04-19 14:38:21 +02:00
Marc Delisle
58a3c57e7a Fix merge conflicts 2012-04-18 08:48:28 -04:00
Marc Delisle
3c587da09b bug #3518983 [designer] Error messages do not appear in the Designer 2012-04-18 08:46:01 -04:00